diff options
| -rw-r--r-- | lib/CodeGen/CGExprCXX.cpp | 8 | ||||
| -rw-r--r-- | test/CodeGenCXX/exceptions.cpp | 18 |
2 files changed, 26 insertions, 0 deletions
diff --git a/lib/CodeGen/CGExprCXX.cpp b/lib/CodeGen/CGExprCXX.cpp index bba7864bff..2b8efa0e39 100644 --- a/lib/CodeGen/CGExprCXX.cpp +++ b/lib/CodeGen/CGExprCXX.cpp @@ -993,6 +993,10 @@ llvm::Value *CodeGenFunction::EmitCXXNewExpr(const CXXNewExpr *E) { llvm::Value *NewPtr = RV.getScalarVal(); unsigned AS = cast<llvm::PointerType>(NewPtr->getType())->getAddressSpace(); + // The null-check means that the initializer is conditionally + // evaluated. + ConditionalEvaluation conditional(*this); + if (NullCheckResult) { NullCheckSource = Builder.GetInsertBlock(); NewNotNull = createBasicBlock("new.notnull"); @@ -1001,6 +1005,8 @@ llvm::Value *CodeGenFunction::EmitCXXNewExpr(const CXXNewExpr *E) { llvm::Value *IsNull = Builder.CreateIsNull(NewPtr, "new.isnull"); Builder.CreateCondBr(IsNull, NewEnd, NewNotNull); EmitBlock(NewNotNull); + + conditional.begin(*this); } assert((AllocSize == AllocSizeWithoutCookie) == @@ -1042,6 +1048,8 @@ llvm::Value *CodeGenFunction::EmitCXXNewExpr(const CXXNewExpr *E) { DeactivateCleanupBlock(CallOperatorDelete); if (NullCheckResult) { + conditional.end(*this); + Builder.CreateBr(NewEnd); llvm::BasicBlock *NotNullSource = Builder.GetInsertBlock(); EmitBlock(NewEnd); diff --git a/test/CodeGenCXX/exceptions.cpp b/test/CodeGenCXX/exceptions.cpp index e7231cc7d3..5c38f01309 100644 --- a/test/CodeGenCXX/exceptions.cpp +++ b/test/CodeGenCXX/exceptions.cpp @@ -305,3 +305,21 @@ namespace test6 { } } } + +// PR9298 +namespace test7 { + struct A { A(); ~A(); }; + struct B { + // The throw() operator means that a bad allocation is signalled + // with a null return, which means that the initializer is + // evaluated conditionally. + static void *operator new(size_t size) throw(); + B(const A&, B*); + ~B(); + }; + + // Just make sure the result passes verification. + B *test() { + return new B(A(), new B(A(), 0)); + } +} |