intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-08 17:28:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle primary bases in AddVCallOffsets.

Browse Source 
llvm-svn: 96461
This commit is contained in:
Anders Carlsson
2010-02-17 06:30:02 +00:00
parent e78bc753fe
commit d2fd302726
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
clang/lib/CodeGen/CGVtable.cpp
View File

@@ -985,10 +985,17 @@ VtableBuilder::AddVCallAndVBaseOffsets(BaseSubobject Base,
void VtableBuilder::AddVCallOffsets(BaseSubobject Base) {
const CXXRecordDecl *RD = Base.getBase();
const ASTRecordLayout &Layout = Context.getASTRecordLayout(RD);
// Handle the primary base first.
const CXXRecordDecl *PrimaryBase = Layout.getPrimaryBase();
assert(!PrimaryBase && "FIXME: Handle the primary base!");
if (PrimaryBase && Layout.getPrimaryBaseWasVirtual()) {
// Get the base offset of the primary base.
uint64_t PrimaryBaseOffset = Base.getBaseOffset() +
Layout.getBaseClassOffset(PrimaryBase);
AddVCallOffsets(BaseSubobject(PrimaryBase, PrimaryBaseOffset));
}
// Add the vcall offsets.
for (CXXRecordDecl::method_iterator I = RD->method_begin(),