diff options
| author | Anders Carlsson <andersca@mac.com> | 2010-04-30 00:04:01 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2010-04-30 00:04:01 +0000 |
| commit | 786a3d910e78bc44b035db5c7f005164922fa579 (patch) | |
| tree | 304d23b9bb18a1d1818fb5920135d3a0a3524a6c | |
| parent | 2b4ec8d0034be1e4488cad728f06f3687ece5343 (diff) | |
| download | bcm5719-llvm-786a3d910e78bc44b035db5c7f005164922fa579.tar.gz bcm5719-llvm-786a3d910e78bc44b035db5c7f005164922fa579.zip | |
Get the base class addresses before calling EmitClassCopyAssignment.
llvm-svn: 102676
| -rw-r--r-- | clang/lib/CodeGen/CGClass.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp index 1641a83a60e..98ed1b3b2f0 100644 --- a/clang/lib/CodeGen/CGClass.cpp +++ b/clang/lib/CodeGen/CGClass.cpp @@ -778,13 +778,16 @@ void CodeGenFunction::SynthesizeCXXCopyAssignment(const FunctionArgList &Args) { for (CXXRecordDecl::base_class_const_iterator Base = ClassDecl->bases_begin(); Base != ClassDecl->bases_end(); ++Base) { - // FIXME. copy assignment of virtual base NYI - if (Base->isVirtual()) - continue; - + + llvm::Value *Dest = GetAddressOfBaseClass(ThisPtr, ClassDecl, + CXXBaseSpecifierArray(Base), + /*NullCheckValue=*/false); + llvm::Value *Src = GetAddressOfBaseClass(SrcPtr, ClassDecl, + CXXBaseSpecifierArray(Base), + /*NullCheckValue=*/false); CXXRecordDecl *BaseClassDecl = cast<CXXRecordDecl>(Base->getType()->getAs<RecordType>()->getDecl()); - EmitClassCopyAssignment(ThisPtr, SrcPtr, ClassDecl, BaseClassDecl); + EmitClassCopyAssignment(Dest, Src, 0, BaseClassDecl); } for (CXXRecordDecl::field_iterator Field = ClassDecl->field_begin(), |
