diff options
| -rw-r--r-- | lib/Transforms/ObjCARC/ObjCARCContract.cpp | 5 | ||||
| -rw-r--r-- | test/Transforms/ObjCARC/contract-end-of-use-list.ll | 30 |
2 files changed, 33 insertions, 2 deletions
diff --git a/lib/Transforms/ObjCARC/ObjCARCContract.cpp b/lib/Transforms/ObjCARC/ObjCARCContract.cpp index 1412181766..3da5a0e6d2 100644 --- a/lib/Transforms/ObjCARC/ObjCARCContract.cpp +++ b/lib/Transforms/ObjCARC/ObjCARCContract.cpp @@ -475,8 +475,9 @@ bool ObjCARCContract::runOnFunction(Function &F) { for (unsigned i = 0, e = PHI->getNumIncomingValues(); i != e; ++i) if (PHI->getIncomingBlock(i) == BB) { // Keep the UI iterator valid. - if (&PHI->getOperandUse( - PHINode::getOperandNumForIncomingValue(i)) == &U) + if (UI != UE && + &PHI->getOperandUse( + PHINode::getOperandNumForIncomingValue(i)) == &*UI) ++UI; PHI->setIncomingValue(i, Replacement); } diff --git a/test/Transforms/ObjCARC/contract-end-of-use-list.ll b/test/Transforms/ObjCARC/contract-end-of-use-list.ll new file mode 100644 index 0000000000..a38cd8a1da --- /dev/null +++ b/test/Transforms/ObjCARC/contract-end-of-use-list.ll @@ -0,0 +1,30 @@ +; RUN: opt -S < %s -objc-arc-expand -objc-arc-contract | FileCheck %s +; Don't crash. Reproducer for a use_iterator bug from r203364. +; rdar://problem/16333235 +target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-apple-darwin13.2.0" + +%struct = type { i8*, i8* } + +; CHECK-LABEL: @foo() { +define internal i8* @foo() { +entry: + %call = call i8* @bar() +; CHECK: %retained1 = call i8* @objc_retainAutoreleasedReturnValue(i8* %call) + %retained1 = call i8* @objc_retain(i8* %call) + %isnull = icmp eq i8* %retained1, null + br i1 %isnull, label %cleanup, label %if.end + +if.end: +; CHECK: %retained2 = call i8* @objc_retain(i8* %retained1) + %retained2 = call i8* @objc_retain(i8* %retained1) + br label %cleanup + +cleanup: + %retval = phi i8* [ %retained2, %if.end ], [ null, %entry ] + ret i8* %retval +} + +declare i8* @bar() + +declare extern_weak i8* @objc_retain(i8*) |