Improve irgen of 'new' further.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@72677 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 24 insertions, 8 deletions

diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp
index febfbacf7c..2cc9d0390f 100644
--- a/lib/CodeGen/CGCXX.cpp
+++ b/lib/CodeGen/CGCXX.cpp
@@ -285,11 +285,23 @@ llvm::Value *CodeGenFunction::EmitCXXNewExpr(const CXXNewExpr *E) {
              CGM.GetAddrOfFunction(GlobalDecl(NewFD)),
              NewArgs, NewFD);
 
-  llvm::Value *NewPtr = Builder.CreateBitCast(RV.getScalarVal(), 
-                                              ConvertType(E->getType()));
-
+  // If an allocation function is declared with an empty exception specification
+  // it returns null to indicate failure to allocate storage. [expr.new]p13.
+  // (We don't need to check for null when there's no new initializer and
+  // we're allocating a POD type).
+  bool NullCheckResult = NewFTy->hasEmptyExceptionSpec() &&
+    !(AllocType->isPODType() && !E->hasInitializer());
+
+  if (NullCheckResult) {
+    ErrorUnsupported(E, "new expr that needs to be null checked");
+    return llvm::UndefValue::get(ConvertType(E->getType()));
+  }
+  
+  llvm::Value *NewPtr = 
+    Builder.CreateBitCast(RV.getScalarVal(), ConvertType(E->getType()));
+  
   if (AllocType->isPODType()) {
-    if (E->getNumConstructorArgs() != 0) {
+    if (E->hasInitializer()) {
       assert(E->getNumConstructorArgs() == 1 && 
              "Can only have one argument to initializer of POD type.");
 
@@ -302,12 +314,16 @@ llvm::Value *CodeGenFunction::EmitCXXNewExpr(const CXXNewExpr *E) {
       else
         EmitAggExpr(Init, NewPtr, AllocType.isVolatileQualified());
     }
+  } else {
+    // Call the constructor.    
+    CXXConstructorDecl *Ctor = E->getConstructor();
     
-    return NewPtr;
+    EmitCXXConstructorCall(Ctor, Ctor_Complete, NewPtr, 
+                           E->constructor_arg_begin(), 
+                           E->constructor_arg_end());
   }
-  
-  ErrorUnsupported(E, "new expression with non-POD type");
-  return llvm::UndefValue::get(ConvertType(E->getType()));
+
+  return NewPtr;
 }
 
 static bool canGenerateCXXstructor(const CXXRecordDecl *RD,