diff options
| author | Anders Carlsson <andersca@mac.com> | 2010-05-02 23:20:53 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2010-05-02 23:20:53 +0000 |
| commit | 155ed4a23366f4514befb1c9f5f89d16f8b8b6db (patch) | |
| tree | 7987a4f3777d892ae1181ab2abfb2eb09f0a8cd3 /lib/CodeGen/CGExprCXX.cpp | |
| parent | 24eb78e38aba55c507bc3c05c37035a9ab2defa7 (diff) | |
Revert my last change and add a 'ForVirtualBase' parameter to EmitCXXConstructorCall instead.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@102881 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGExprCXX.cpp')
| -rw-r--r-- | lib/CodeGen/CGExprCXX.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/CodeGen/CGExprCXX.cpp b/lib/CodeGen/CGExprCXX.cpp index d4e26cf506..5191f92eef 100644 --- a/lib/CodeGen/CGExprCXX.cpp +++ b/lib/CodeGen/CGExprCXX.cpp @@ -321,10 +321,17 @@ CodeGenFunction::EmitCXXConstructExpr(llvm::Value *Dest, EmitCXXAggrConstructorCall(CD, Array, BaseAddrPtr, E->arg_begin(), E->arg_end()); } - else + else { + CXXCtorType Type = + (E->getConstructionKind() == CXXConstructExpr::CK_Complete) + ? Ctor_Complete : Ctor_Base; + bool ForVirtualBase = + E->getConstructionKind() == CXXConstructExpr::CK_VirtualBase; + // Call the constructor. - EmitCXXConstructorCall(CD, E->getConstructionKind(), Dest, + EmitCXXConstructorCall(CD, Type, ForVirtualBase, Dest, E->arg_begin(), E->arg_end()); + } } static CharUnits CalculateCookiePadding(ASTContext &Ctx, QualType ElementType) { @@ -468,8 +475,8 @@ static void EmitNewInitializer(CodeGenFunction &CGF, const CXXNewExpr *E, QualType AllocType = E->getAllocatedType(); if (CXXConstructorDecl *Ctor = E->getConstructor()) { - CGF.EmitCXXConstructorCall(Ctor, CXXConstructExpr::CK_Complete, NewPtr, - E->constructor_arg_begin(), + CGF.EmitCXXConstructorCall(Ctor, Ctor_Complete, /*ForVirtualBase=*/false, + NewPtr, E->constructor_arg_begin(), E->constructor_arg_end()); return; |