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

Set the correct vtable pointers _before_ generating code for any member initializers. Fixes about ~2000 clang/LLVM tests in the clang-on-clang build. 

llvm-svn: 95116
This commit is contained in:
Anders Carlsson 2010-02-02 19:58:43 +00:00
parent 29e0702dc8
commit 5dc86337fb
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clang/lib/CodeGen/CGClass.cpp
View File

@ -861,6 +861,8 @@ static void EmitMemberInitializer(CodeGenFunction &CGF,
void CodeGenFunction::EmitCtorPrologue(const CXXConstructorDecl *CD,
CXXCtorType CtorType) {
const CXXRecordDecl *ClassDecl = CD->getParent();
llvm::SmallVector<CXXBaseOrMemberInitializer *, 8> MemberInitializers;
// FIXME: Add vbase initialization
@ -875,14 +877,17 @@ void CodeGenFunction::EmitCtorPrologue(const CXXConstructorDecl *CD,
if (Member->isBaseInitializer())
EmitBaseInitializer(*this, ClassDecl, Member, CtorType);
else
EmitMemberInitializer(*this, ClassDecl, Member);
// Pop any live temporaries that the initializers might have pushed.
while (!LiveTemporaries.empty())
PopCXXTemporary();
MemberInitializers.push_back(Member);
}
InitializeVtablePtrs(ClassDecl);
for (unsigned I = 0, E = MemberInitializers.size(); I != E; ++I) {
assert(LiveTemporaries.empty() &&
"Should not have any live temporaries at initializer start!");
EmitMemberInitializer(*this, ClassDecl, MemberInitializers[I]);
}
}
/// EmitDtorEpilogue - Emit all code that comes at the end of class's

22
clang/test/CodeGenCXX/member-initializers.cpp Normal file
View File

@ -0,0 +1,22 @@
// RUN: %clang_cc1 -emit-llvm %s -o - -triple=x86_64-apple-darwin10 -O3 | FileCheck %s
struct A {
virtual int f() { return 1; }
};
struct B : A {
B() : i(f()) { }
virtual int f() { return 2; }
int i;
};
// CHECK: define i32 @_Z1fv() nounwind
int f() {
B b;
// CHECK: call i32 @_ZN1B1fEv
return b.i;
}