diff options
| author | Timur Iskhodzhanov <timurrrr@google.com> | 2013-11-08 11:45:35 +0000 |
|---|---|---|
| committer | Timur Iskhodzhanov <timurrrr@google.com> | 2013-11-08 11:45:35 +0000 |
| commit | 6acb04f755cfc73d05772457d70aeb5adfaf6d8f (patch) | |
| tree | e58a14a5d1bf515228bf07de0a7502c42818aab9 /lib/AST/RecordLayout.cpp | |
| parent | db7da0b31dd6c4644e87d77835c9e57d3042dda1 (diff) | |
Thread the info about vbptr sharing through ASTRecordLayout
Reviewed at http://llvm-reviews.chandlerc.com/D2120
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@194256 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AST/RecordLayout.cpp')
| -rw-r--r-- | lib/AST/RecordLayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/AST/RecordLayout.cpp b/lib/AST/RecordLayout.cpp index 44af1f18d9..df5f79c961 100644 --- a/lib/AST/RecordLayout.cpp +++ b/lib/AST/RecordLayout.cpp @@ -44,7 +44,6 @@ ASTRecordLayout::ASTRecordLayout(const ASTContext &Ctx, CharUnits size, ASTRecordLayout::ASTRecordLayout(const ASTContext &Ctx, CharUnits size, CharUnits alignment, bool hasOwnVFPtr, bool hasVFPtr, - bool hasOwnVBPtr, CharUnits vbptroffset, CharUnits datasize, const uint64_t *fieldoffsets, @@ -54,6 +53,7 @@ ASTRecordLayout::ASTRecordLayout(const ASTContext &Ctx, CharUnits SizeOfLargestEmptySubobject, const CXXRecordDecl *PrimaryBase, bool IsPrimaryBaseVirtual, + const CXXRecordDecl *BaseSharingVBPtr, bool AlignAfterVBases, const BaseOffsetsMapTy& BaseOffsets, const VBaseOffsetsMapTy& VBaseOffsets) @@ -75,7 +75,7 @@ ASTRecordLayout::ASTRecordLayout(const ASTContext &Ctx, CXXInfo->HasOwnVFPtr = hasOwnVFPtr; CXXInfo->VBPtrOffset = vbptroffset; CXXInfo->HasVFPtr = hasVFPtr; - CXXInfo->HasOwnVBPtr = hasOwnVBPtr; + CXXInfo->BaseSharingVBPtr = BaseSharingVBPtr; CXXInfo->AlignAfterVBases = AlignAfterVBases; |