diff options
Diffstat (limited to 'lib/AST/RecordLayout.cpp')
| -rw-r--r-- | lib/AST/RecordLayout.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/AST/RecordLayout.cpp b/lib/AST/RecordLayout.cpp index 2cf7e4a1cb..262c4597f8 100644 --- a/lib/AST/RecordLayout.cpp +++ b/lib/AST/RecordLayout.cpp @@ -45,7 +45,8 @@ ASTRecordLayout::ASTRecordLayout(ASTContext &Ctx, uint64_t nonvirtualsize, unsigned nonvirtualalign, uint64_t SizeOfLargestEmptySubobject, - const PrimaryBaseInfo &PrimaryBase, + const CXXRecordDecl *PrimaryBase, + bool PrimaryBaseIsVirtual, const BaseOffsetsMapTy& BaseOffsets, const BaseOffsetsMapTy& VBaseOffsets) : Size(size), DataSize(datasize), FieldOffsets(0), Alignment(alignment), @@ -56,7 +57,7 @@ ASTRecordLayout::ASTRecordLayout(ASTContext &Ctx, memcpy(FieldOffsets, fieldoffsets, FieldCount * sizeof(*FieldOffsets)); } - CXXInfo->PrimaryBase = PrimaryBase; + CXXInfo->PrimaryBase = PrimaryBaseInfo(PrimaryBase, PrimaryBaseIsVirtual); CXXInfo->NonVirtualSize = nonvirtualsize; CXXInfo->NonVirtualAlign = nonvirtualalign; CXXInfo->SizeOfLargestEmptySubobject = SizeOfLargestEmptySubobject; |