maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Clean up EmitClassMemberwiseCopy further. 

llvm-svn: 102846
This commit is contained in:
Anders Carlsson 2010-05-01 16:54:05 +00:00
parent 820022c55c
commit ab826ad169
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -593,29 +593,18 @@ static llvm::Value *GetVTTParameter(CodeGenFunction &CGF, GlobalDecl GD) {
/// or via a copy constructor call. /// or via a copy constructor call.
void CodeGenFunction::EmitClassMemberwiseCopy( void CodeGenFunction::EmitClassMemberwiseCopy(
llvm::Value *Dest, llvm::Value *Src, llvm::Value *Dest, llvm::Value *Src,
const CXXRecordDecl *ClassDecl, const CXXRecordDecl *ClassDecl) {
const CXXRecordDecl *BaseClassDecl) { if (ClassDecl->hasTrivialCopyConstructor()) {
CXXCtorType CtorType = Ctor_Complete; EmitAggregateCopy(Dest, Src, getContext().getTagDeclType(ClassDecl));
if (ClassDecl) {
Dest = OldGetAddressOfBaseClass(Dest, ClassDecl, BaseClassDecl);
Src = OldGetAddressOfBaseClass(Src, ClassDecl, BaseClassDecl);
// We want to call the base constructor.
CtorType = Ctor_Base;
}
if (BaseClassDecl->hasTrivialCopyConstructor()) {
EmitAggregateCopy(Dest, Src, getContext().getTagDeclType(BaseClassDecl));
return; return;
} }
CXXConstructorDecl *BaseCopyCtor = CXXConstructorDecl *CopyCtor = ClassDecl->getCopyConstructor(getContext(), 0);
BaseClassDecl->getCopyConstructor(getContext(), 0); assert(CopyCtor && "Did not have copy ctor!");
if (!BaseCopyCtor)
return;
llvm::Value *VTT = GetVTTParameter(*this, GlobalDecl(BaseCopyCtor, CtorType)); llvm::Value *VTT = GetVTTParameter(*this, GlobalDecl(CopyCtor,
EmitCopyCtorCall(*this, BaseCopyCtor, CtorType, Dest, VTT, Src); Ctor_Complete));
EmitCopyCtorCall(*this, CopyCtor, Ctor_Complete, Dest, VTT, Src);
} }
/// EmitClassCopyAssignment - This routine generates code to copy assign a class /// EmitClassCopyAssignment - This routine generates code to copy assign a class
@ -718,7 +707,7 @@ CodeGenFunction::SynthesizeCXXCopyConstructor(const FunctionArgList &Args) {
} }
else else
EmitClassMemberwiseCopy(LHS.getAddress(), RHS.getAddress(), EmitClassMemberwiseCopy(LHS.getAddress(), RHS.getAddress(),
0 /*ClassDecl*/, FieldClassDecl); FieldClassDecl);
continue; continue;
} }

3
clang/lib/CodeGen/CodeGenFunction.h
View File

@ -818,8 +818,7 @@ public:
QualType Ty); QualType Ty);
void EmitClassMemberwiseCopy(llvm::Value *DestValue, llvm::Value *SrcValue, void EmitClassMemberwiseCopy(llvm::Value *DestValue, llvm::Value *SrcValue,
const CXXRecordDecl *ClassDecl, const CXXRecordDecl *ClassDecl);
const CXXRecordDecl *BaseClassDecl);
void EmitClassCopyAssignment(llvm::Value *DestValue, llvm::Value *SrcValue, void EmitClassCopyAssignment(llvm::Value *DestValue, llvm::Value *SrcValue,
const CXXRecordDecl *ClassDecl); const CXXRecordDecl *ClassDecl);