replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't add this adjustments for pure virtual member functions. 

llvm-svn: 97334
This commit is contained in:
Anders Carlsson 2010-02-27 18:16:50 +00:00
parent 01d3c7da60
commit 2b381bbb5c
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1315,8 +1315,12 @@ void VtableBuilder::ComputeThisAdjustments() {
continue;
uint64_t VtableIndex = MethodInfo.VtableIndex;
// Ignore this adjustments for unused function pointers.
// Ignore adjustments for pure virtual member functions.
if (Overrider.Method->isPure())
continue;
// Ignore adjustments for unused function pointers.
if (Components[VtableIndex].getKind() ==
VtableComponent::CK_UnusedFunctionPointer)
continue;

35
clang/test/CodeGenCXX/vtable-layout.cpp
View File

@ -753,4 +753,37 @@ struct D : C, B, virtual A {
};
void D::f() { }
}
}
namespace Test20 {
// pure virtual member functions should never have 'this' adjustments.
struct A {
virtual void f() = 0;
virtual void g();
};
struct B : A { };
// CHECK: Vtable for 'Test20::C' (9 entries).
// CHECK-NEXT: 0 | offset_to_top (0)
// CHECK-NEXT: 1 | Test20::C RTTI
// CHECK-NEXT: -- (Test20::A, 0) vtable address --
// CHECK-NEXT: -- (Test20::C, 0) vtable address --
// CHECK-NEXT: 2 | void Test20::C::f() [pure]
// CHECK-NEXT: 3 | void Test20::A::g()
// CHECK-NEXT: 4 | void Test20::C::h()
// CHECK-NEXT: 5 | offset_to_top (-8)
// CHECK-NEXT: 6 | Test20::C RTTI
// CHECK-NEXT: -- (Test20::A, 8) vtable address --
// CHECK-NEXT: -- (Test20::B, 8) vtable address --
// CHECK-NEXT: 7 | void Test20::C::f() [pure]
// CHECK-NEXT: 8 | void Test20::A::g()
struct C : A, B {
virtual void f() = 0;
virtual void h();
};
void C::h() { }
}