maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix another bug and add another class. 

llvm-svn: 96590
This commit is contained in:
Anders Carlsson 2010-02-18 17:32:33 +00:00
parent 32db8a17c5
commit e5faca7cda
2 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1138,9 +1138,17 @@ void VtableBuilder::AddVCallOffsets(BaseSubobject Base) {
const ASTRecordLayout &MostDerivedClassLayout =
Context.getASTRecordLayout(MostDerivedClass);
// FIXME: We should not use / 8 here.
FinalOverriders::OverriderInfo Overrider =
Overriders.getOverrider(Base, MD);
Offset =
-(int64_t)MostDerivedClassLayout.getVBaseClassOffset(VBaseDecl) / 8;
-(int64_t)MostDerivedClassLayout.getVBaseClassOffset(VBaseDecl);
// The base offset should be relative to the final overrider.
Offset += Overrider.BaseOffset;
// FIXME: We should not use / 8 here.
Offset = Offset / 8;
}
VCallAndVBaseOffsets.push_back(VtableComponent::MakeVCallOffset(Offset));

34
clang/test/CodeGenCXX/vtable-layout-abi-examples.cpp
View File

@ -71,4 +71,38 @@ struct C: public virtual A {
int ic;
};
void C::g() {}
// CHECK: Vtable for 'Test1::D' (18 entries).
// CHECK-NEXT: 0 | vbase_offset (32)
// CHECK-NEXT: 1 | offset_to_top (0)
// CHECK-NEXT: 2 | Test1::D RTTI
// CHECK-NEXT: -- (Test1::B, 0) vtable address --
// CHECK-NEXT: -- (Test1::D, 0) vtable address --
// CHECK-NEXT: 3 | void Test1::B::f()
// CHECK-NEXT: 4 | void Test1::D::h()
// CHECK-NEXT: 5 | vbase_offset (16)
// CHECK-NEXT: 6 | offset_to_top (-16)
// CHECK-NEXT: 7 | Test1::D RTTI
// CHECK-NEXT: -- (Test1::C, 16) vtable address --
// CHECK-NEXT: 8 | void Test1::C::g()
// CHECK-NEXT: 9 | void Test1::D::h()
// CHECK-NEXT: [this adjustment: -16 non-virtual]
// CHECK-NEXT: 10 | vcall_offset (-32)
// CHECK-NEXT: 11 | vcall_offset (-16)
// CHECK-NEXT: 12 | vcall_offset (-32)
// CHECK-NEXT: 13 | offset_to_top (-32)
// CHECK-NEXT: 14 | Test1::D RTTI
// CHECK-NEXT: -- (Test1::A, 32) vtable address --
// CHECK-NEXT: 15 | void Test1::B::f()
// CHECK-NEXT: [this adjustment: 0 non-virtual, -24 vcall offset offset]
// CHECK-NEXT: 16 | void Test1::C::g()
// CHECK-NEXT: [this adjustment: 0 non-virtual, -32 vcall offset offset]
// CHECK-NEXT: 17 | void Test1::D::h()
// CHECK-NEXT: [this adjustment: 0 non-virtual, -40 vcall offset offset]
struct D: public B, public C {
void h ();
int id;
};
void D::h() { }
}