1 files changed, 7 insertions, 5 deletions
diff --git a/lib/CodeGen/CGExprCXX.cpp b/lib/CodeGen/CGExprCXX.cpp
index 149f616bf0..b57cdc9334 100644
--- a/lib/CodeGen/CGExprCXX.cpp
+++ b/lib/CodeGen/CGExprCXX.cpp
@@ -465,11 +465,13 @@ static void EmitNewInitializer(CodeGenFunction &CGF, const CXXNewExpr *E,
                                llvm::Value *NewPtr,
                                llvm::Value *NumElements) {
   if (E->isArray()) {
-    if (CXXConstructorDecl *Ctor = E->getConstructor())
-      CGF.EmitCXXAggrConstructorCall(Ctor, NumElements, NewPtr, 
-                                     E->constructor_arg_begin(), 
-                                     E->constructor_arg_end());
-    return;
+    if (CXXConstructorDecl *Ctor = E->getConstructor()) {
+      if (!Ctor->getParent()->hasTrivialConstructor())
+        CGF.EmitCXXAggrConstructorCall(Ctor, NumElements, NewPtr, 
+                                       E->constructor_arg_begin(), 
+                                       E->constructor_arg_end());
+      return;
+    }
   }
   
   QualType AllocType = E->getAllocatedType();