[cfe-commits] r151203 - in /cfe/trunk: lib/CodeGen/CGExprCXX.cpp test/CodeGenCXX/new-array-init-exceptions.cpp
Chad Rosier
mcrosier at apple.com
Wed Feb 22 13:36:06 PST 2012
Author: mcrosier
Date: Wed Feb 22 15:36:06 2012
New Revision: 151203
URL: http://llvm.org/viewvc/llvm-project?rev=151203&view=rev
Log:
Revert r151172: Unwind path cleanup for array new list initializers.
Removed:
cfe/trunk/test/CodeGenCXX/new-array-init-exceptions.cpp
Modified:
cfe/trunk/lib/CodeGen/CGExprCXX.cpp
Modified: cfe/trunk/lib/CodeGen/CGExprCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprCXX.cpp?rev=151203&r1=151202&r2=151203&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprCXX.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprCXX.cpp Wed Feb 22 15:36:06 2012
@@ -804,32 +804,12 @@
unsigned initializerElements = 0;
const Expr *Init = E->getInitializer();
- llvm::AllocaInst *endOfInit = 0;
- QualType::DestructionKind dtorKind = elementType.isDestructedType();
- EHScopeStack::stable_iterator cleanup;
- llvm::Instruction *cleanupDominator = 0;
// If the initializer is an initializer list, first do the explicit elements.
if (const InitListExpr *ILE = dyn_cast<InitListExpr>(Init)) {
initializerElements = ILE->getNumInits();
-
- // Enter a partial-destruction cleanup if necessary.
- if (needsEHCleanup(dtorKind)) {
- // In principle we could tell the cleanup where we are more
- // directly, but the control flow can get so varied here that it
- // would actually be quite complex. Therefore we go through an
- // alloca.
- endOfInit = CreateTempAlloca(beginPtr->getType(), "array.endOfInit");
- cleanupDominator = Builder.CreateStore(beginPtr, endOfInit);
- pushIrregularPartialArrayCleanup(beginPtr, endOfInit, elementType,
- getDestroyer(dtorKind));
- cleanup = EHStack.stable_begin();
- }
-
+ QualType elementType = E->getAllocatedType();
+ // FIXME: exception-safety for the explicit initializers
for (unsigned i = 0, e = ILE->getNumInits(); i != e; ++i) {
- // Tell the cleanup that it needs to destroy up to this
- // element. TODO: some of these stores can be trivially
- // observed to be unnecessary.
- if (endOfInit) Builder.CreateStore(explicitPtr, endOfInit);
StoreAnyExprIntoOneUnit(*this, ILE->getInit(i), elementType, explicitPtr);
explicitPtr =Builder.CreateConstGEP1_32(explicitPtr, 1, "array.exp.next");
}
@@ -845,12 +825,7 @@
// anything left to initialize.
if (llvm::ConstantInt *constNum = dyn_cast<llvm::ConstantInt>(numElements)) {
// If all elements have already been initialized, skip the whole loop.
- if (constNum->getZExtValue() <= initializerElements) {
- // If there was a cleanup, deactivate it.
- if (cleanupDominator)
- DeactivateCleanupBlock(cleanup, cleanupDominator);;
- return;
- }
+ if (constNum->getZExtValue() <= initializerElements) return;
} else {
llvm::BasicBlock *nonEmptyBB = createBasicBlock("new.loop.nonempty");
llvm::Value *isEmpty = Builder.CreateICmpEQ(explicitPtr, endPtr,
@@ -870,11 +845,11 @@
Builder.CreatePHI(explicitPtr->getType(), 2, "array.cur");
curPtr->addIncoming(explicitPtr, entryBB);
- // Store the new cleanup position for irregular cleanups.
- if (endOfInit) Builder.CreateStore(curPtr, endOfInit);
-
// Enter a partial-destruction cleanup if necessary.
- if (!cleanupDominator && needsEHCleanup(dtorKind)) {
+ QualType::DestructionKind dtorKind = elementType.isDestructedType();
+ EHScopeStack::stable_iterator cleanup;
+ llvm::Instruction *cleanupDominator = 0;
+ if (needsEHCleanup(dtorKind)) {
pushRegularPartialArrayCleanup(beginPtr, curPtr, elementType,
getDestroyer(dtorKind));
cleanup = EHStack.stable_begin();
Removed: cfe/trunk/test/CodeGenCXX/new-array-init-exceptions.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/new-array-init-exceptions.cpp?rev=151202&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/new-array-init-exceptions.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/new-array-init-exceptions.cpp (removed)
@@ -1,40 +0,0 @@
-// RUN: %clang_cc1 -std=c++11 -triple i386-unknown-unknown -fexceptions -fcxx-exceptions %s -emit-llvm -o - | FileCheck %s
-
-struct Throws {
- Throws(int);
- Throws();
- ~Throws();
-};
-
-// CHECK: define void @_Z7cleanupi
-void cleanup(int n) {
- // CHECK: invoke void @_ZN6ThrowsC1Ei
- // CHECK-NEXT: to label %{{[^ ]+}} unwind label %[[LPAD:[^ ]+]]
- // CHECK: invoke void @_ZN6ThrowsC1Ei
- // CHECK-NEXT: to label %{{[^ ]+}} unwind label %[[LPAD]]
- // CHECK: invoke void @_ZN6ThrowsC1Ei
- // CHECK-NEXT: to label %{{[^ ]+}} unwind label %[[LPAD]]
- // CHECK: invoke void @_ZN6ThrowsC1Ev
- // CHECK-NEXT: to label %{{[^ ]+}} unwind label %[[LPAD]]
- new Throws[n] { 1, 2, 3 };
- // CHECK: [[LPAD]]:
- // CHECK-NEXT: landingpad
- // CHECK: call void @_ZN6ThrowsD1Ev
- // CHECK: call void @_ZdaPv
-}
-
-
-// CHECK: define void @_Z7cleanupv
-void cleanup() {
- // CHECK: invoke void @_ZN6ThrowsC1Ei
- // CHECK-NEXT: to label %{{[^ ]+}} unwind label %[[LPAD2:[^ ]+]]
- // CHECK: invoke void @_ZN6ThrowsC1Ei
- // CHECK-NEXT: to label %{{[^ ]+}} unwind label %[[LPAD2]]
- // CHECK: invoke void @_ZN6ThrowsC1Ei
- // CHECK-NEXT: to label %{{[^ ]+}} unwind label %[[LPAD2]]
- new Throws[3] { 1, 2, 3 };
- // CHECK: [[LPAD2]]:
- // CHECK-NEXT: landingpad
- // CHECK: call void @_ZN6ThrowsD1Ev
- // CHECK: call void @_ZdaPv
-}
More information about the cfe-commits
mailing list