diff options
| author | Mike Stump <mrs@apple.com> | 2009-08-19 02:53:08 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@apple.com> | 2009-08-19 02:53:08 +0000 |
| commit | 09765ece710f29dcdbd66eec361d60e53bd5a4fd (patch) | |
| tree | 4846efdc6058e0ec21cb966caf67aeab461ad189 /lib/CodeGen | |
| parent | b46c92dfedf02239e7c73b9a18dcf09071731793 (diff) | |
Restore vbase offsets for classes without a primary.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@79402 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen')
| -rw-r--r-- | lib/CodeGen/CGCXX.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp index f95aa289a3..6c054ea5fc 100644 --- a/lib/CodeGen/CGCXX.cpp +++ b/lib/CodeGen/CGCXX.cpp @@ -784,7 +784,7 @@ public: // The virtual base offsets come first... // FIXME: Audit, is this right? - if (forPrimary || !PrimaryBaseWasVirtual) { + if (PrimaryBase == 0 || forPrimary || !PrimaryBaseWasVirtual) { llvm::SmallSet<const CXXRecordDecl *, 32> SeenVBase; std::vector<llvm::Constant *> offsets; GenerateVBaseOffsets(offsets, RD, SeenVBase, Offset, Layout); |