diff options
| -rw-r--r-- | include/clang/AST/ExprCXX.h | 4 | ||||
| -rw-r--r-- | lib/CodeGen/CGClass.cpp | 8 | ||||
| -rw-r--r-- | lib/CodeGen/CGExprCXX.cpp | 6 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenFunction.h | 3 |
4 files changed, 12 insertions, 9 deletions
diff --git a/include/clang/AST/ExprCXX.h b/include/clang/AST/ExprCXX.h index 250e09af53..bef5827772 100644 --- a/include/clang/AST/ExprCXX.h +++ b/include/clang/AST/ExprCXX.h @@ -690,8 +690,8 @@ public: /// \brief Determines whether this constructor is actually constructing /// a base class (rather than a complete object). - bool isBaseInitialization() const { - return ConstructKind != CK_Complete; + ConstructionKind getConstructionKind() const { + return (ConstructionKind)ConstructKind; } void setConstructionKind(ConstructionKind CK) { ConstructKind = CK; diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp index 0f1b015966..27eb1d7643 100644 --- a/lib/CodeGen/CGClass.cpp +++ b/lib/CodeGen/CGClass.cpp @@ -1085,7 +1085,8 @@ CodeGenFunction::EmitCXXAggrConstructorCall(const CXXConstructorDecl *D, { CXXTemporariesCleanupScope Scope(*this); - EmitCXXConstructorCall(D, Ctor_Complete, Address, ArgBeg, ArgEnd); + EmitCXXConstructorCall(D, CXXConstructExpr::CK_Complete, Address, + ArgBeg, ArgEnd); } EmitBlock(ContinueBlock); @@ -1222,10 +1223,13 @@ CodeGenFunction::GenerateCXXAggrDestructorHelper(const CXXDestructorDecl *D, void CodeGenFunction::EmitCXXConstructorCall(const CXXConstructorDecl *D, - CXXCtorType Type, + CXXConstructExpr::ConstructionKind Kind, llvm::Value *This, CallExpr::const_arg_iterator ArgBeg, CallExpr::const_arg_iterator ArgEnd) { + CXXCtorType Type = + (Kind == CXXConstructExpr::CK_Complete) ? Ctor_Complete : Ctor_Base; + if (D->isTrivial()) { if (ArgBeg == ArgEnd) { // Trivial default constructor, no codegen required. diff --git a/lib/CodeGen/CGExprCXX.cpp b/lib/CodeGen/CGExprCXX.cpp index 1f25f2de26..d4e26cf506 100644 --- a/lib/CodeGen/CGExprCXX.cpp +++ b/lib/CodeGen/CGExprCXX.cpp @@ -323,9 +323,7 @@ CodeGenFunction::EmitCXXConstructExpr(llvm::Value *Dest, } else // Call the constructor. - EmitCXXConstructorCall(CD, - E->isBaseInitialization()? Ctor_Base : Ctor_Complete, - Dest, + EmitCXXConstructorCall(CD, E->getConstructionKind(), Dest, E->arg_begin(), E->arg_end()); } @@ -470,7 +468,7 @@ static void EmitNewInitializer(CodeGenFunction &CGF, const CXXNewExpr *E, QualType AllocType = E->getAllocatedType(); if (CXXConstructorDecl *Ctor = E->getConstructor()) { - CGF.EmitCXXConstructorCall(Ctor, Ctor_Complete, NewPtr, + CGF.EmitCXXConstructorCall(Ctor, CXXConstructExpr::CK_Complete, NewPtr, E->constructor_arg_begin(), E->constructor_arg_end()); diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h index 5ecc9a20c3..f98cbb4306 100644 --- a/lib/CodeGen/CodeGenFunction.h +++ b/lib/CodeGen/CodeGenFunction.h @@ -815,7 +815,8 @@ public: void EmitDelegateCXXConstructorCall(const CXXConstructorDecl *Ctor, CXXCtorType CtorType, const FunctionArgList &Args); - void EmitCXXConstructorCall(const CXXConstructorDecl *D, CXXCtorType Type, + void EmitCXXConstructorCall(const CXXConstructorDecl *D, + CXXConstructExpr::ConstructionKind ConstructKind, llvm::Value *This, CallExpr::const_arg_iterator ArgBeg, CallExpr::const_arg_iterator ArgEnd); |