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

Layout the primary base first in the vtable. 

llvm-svn: 78327
This commit is contained in:
Mike Stump 2009-08-06 18:05:22 +00:00
parent 8d7f6f83fd
commit 2d8d655922
2 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
clang/lib/CodeGen/CGCXX.cpp
View File

@ -576,6 +576,18 @@ llvm::Value *CodeGenFunction::GenerateVtable(const CXXRecordDecl *RD) {
const ASTRecordLayout &Layout = getContext().getASTRecordLayout(RD);
const CXXRecordDecl *PrimaryBase = Layout.getPrimaryBase();
// The primary base comes first.
if (PrimaryBase)
GenerateVtableForBase(PrimaryBase, methods);
for (meth_iter mi = RD->method_begin(), me = RD->method_end(); mi != me;
++mi) {
if (mi->isVirtual()) {
m = CGM.GetAddrOfFunction(GlobalDecl(*mi));
m = llvm::ConstantExpr::getBitCast(m, Ptr8Ty);
methods.push_back(m);
}
}
for (CXXRecordDecl::base_class_const_iterator i = RD->bases_begin(),
e = RD->bases_end(); i != e; ++i) {
if (i->isVirtual())
@ -591,29 +603,10 @@ llvm::Value *CodeGenFunction::GenerateVtable(const CXXRecordDecl *RD) {
// FIXME: GenerateRtti for Base in RD.
m = llvm::Constant::getNullValue(Ptr8Ty);
methods.push_back(m);
}
GenerateVtableForBase(Base, methods);
if (PrimaryBase == Base) {
for (meth_iter mi = RD->method_begin(), me = RD->method_end(); mi != me;
++mi) {
if (mi->isVirtual()) {
m = CGM.GetAddrOfFunction(GlobalDecl(*mi));
m = llvm::ConstantExpr::getBitCast(m, Ptr8Ty);
methods.push_back(m);
}
}
}
}
if (PrimaryBase == 0) {
for (meth_iter mi = RD->method_begin(), me = RD->method_end(); mi != me;
++mi) {
if (mi->isVirtual()) {
m = CGM.GetAddrOfFunction(GlobalDecl(*mi));
m = llvm::ConstantExpr::getBitCast(m, Ptr8Ty);
methods.push_back(m);
}
GenerateVtableForBase(Base, methods);
}
}
// FIXME: finish layout for virtual bases
// FIXME: audit indirect virtual bases
for (CXXRecordDecl::base_class_const_iterator i = RD->vbases_begin(),

9
clang/test/CodeGenCXX/virt.cpp
View File

@ -123,8 +123,8 @@ int main() {
// CHECK-LP32 .space 4
// CHECK-LP32: .space 4
// CHECK-LP32: .space 4
// CHECK-LP32 .long __ZN1D3booEv
// CHECK-LP32 .long __ZN1F3fooEv
// CHECK-LP32: .long __ZN1D3booEv
// CHECK-LP32: .long __ZN1F3fooEv
// CHECK-LP32 .space 4
// CHECK-LP32 .long -8
// CHECK-LP32 .space 4
@ -136,10 +136,9 @@ int main() {
// CHECK-LP64 .space 8
// CHECK-LP64: .space 8
// CHECK-LP64: .space 8
// CHECK-LP64 .quad __ZN1D3booEv
// CHECK-LP64 .quad __ZN1F3fooEv
// CHECK-LP64: .quad __ZN1D3booEv
// CHECK-LP64: .quad __ZN1F3fooEv
// CHECK-LP64 .space 8
// CHECK-LP64 .space -16
// CHECK-LP64 .space 8
// CHECK-LP64: .quad __ZN2D13barEv