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

Rearrange some checks to avoid call to isCopyConstructor() and clarify path 

taken for non-trivial constructors.

llvm-svn: 95457
This commit is contained in:
John McCall 2010-02-06 00:25:16 +00:00
parent 5638c36efd
commit ca972cd1f1
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1227,20 +1227,22 @@ CodeGenFunction::EmitCXXConstructorCall(const CXXConstructorDecl *D,
llvm::Value *This, llvm::Value *This,
CallExpr::const_arg_iterator ArgBeg, CallExpr::const_arg_iterator ArgBeg,
CallExpr::const_arg_iterator ArgEnd) { CallExpr::const_arg_iterator ArgEnd) {
if (D->isCopyConstructor()) { if (D->isTrivial()) {
const CXXRecordDecl *ClassDecl = cast<CXXRecordDecl>(D->getDeclContext()); if (ArgBeg == ArgEnd) {
if (ClassDecl->hasTrivialCopyConstructor()) { // Trivial default constructor, no codegen required.
assert(!ClassDecl->hasUserDeclaredCopyConstructor() && assert(D->isDefaultConstructor() &&
"EmitCXXConstructorCall - user declared copy constructor"); "trivial 0-arg ctor not a default ctor");
const Expr *E = (*ArgBeg);
QualType Ty = E->getType();
llvm::Value *Src = EmitLValue(E).getAddress();
EmitAggregateCopy(This, Src, Ty);
return; return;
} }
} else if (D->isTrivial()) {
// FIXME: Track down why we're trying to generate calls to the trivial assert(ArgBeg + 1 == ArgEnd && "unexpected argcount for trivial ctor");
// default constructor! assert(D->isCopyConstructor() && "trivial 1-arg ctor not a copy ctor");
const CXXRecordDecl *ClassDecl = cast<CXXRecordDecl>(D->getDeclContext());
const Expr *E = (*ArgBeg);
QualType Ty = E->getType();
llvm::Value *Src = EmitLValue(E).getAddress();
EmitAggregateCopy(This, Src, Ty);
return; return;
} }