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 | 2c9341f979378da8af58a9be7eb179294c48378e (patch) | |
| tree | c468035ac49e0cac9b6ca6b7f958ea5987189f4d /clang/lib/AST/RecordLayout.cpp | |
| parent | a3bac169507a63cf936abe6c2f07354a2e068af4 (diff) | |
| download | bcm5719-llvm-2c9341f979378da8af58a9be7eb179294c48378e.tar.gz bcm5719-llvm-2c9341f979378da8af58a9be7eb179294c48378e.zip | |
Thread the info about vbptr sharing through ASTRecordLayout
Reviewed at http://llvm-reviews.chandlerc.com/D2120
llvm-svn: 194256
Diffstat (limited to 'clang/lib/AST/RecordLayout.cpp')
| -rw-r--r-- | clang/lib/AST/RecordLayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/AST/RecordLayout.cpp b/clang/lib/AST/RecordLayout.cpp index 44af1f18d9a..df5f79c9614 100644 --- a/clang/lib/AST/RecordLayout.cpp +++ b/clang/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; |
