diff options
Diffstat (limited to 'lib/CodeGen/CGCXX.cpp')
| -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); |