diff options
| -rw-r--r-- | clang/lib/CodeGen/CGCXX.cpp | 35 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/virt.cpp | 9 |
2 files changed, 18 insertions, 26 deletions
diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp index 7cf397fc07f..567c58373cd 100644 --- a/clang/lib/CodeGen/CGCXX.cpp +++ b/clang/lib/CodeGen/CGCXX.cpp @@ -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(), diff --git a/clang/test/CodeGenCXX/virt.cpp b/clang/test/CodeGenCXX/virt.cpp index f462b0e693e..4ba52bc7ffe 100644 --- a/clang/test/CodeGenCXX/virt.cpp +++ b/clang/test/CodeGenCXX/virt.cpp @@ -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 - |
