Fix accidentally inverted logic from r152803, and make the

testcase slightly less trivial. This fixes rdar://11171718.

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

diff --git a/lib/Transforms/Scalar/ObjCARC.cpp b/lib/Transforms/Scalar/ObjCARC.cpp
index 80c1dd166ec5329729928071d9273973e7e8d720..56e6c4c9574983f82049b0e420d2ef11f7f0827b 100644 (file)
--- a/lib/Transforms/Scalar/ObjCARC.cpp
+++ b/lib/Transforms/Scalar/ObjCARC.cpp
@@ -4073,7 +4073,7 @@ bool ObjCARCContract::runOnFunction(Function &F) {
         if (!UserInst)
           continue;
         // FIXME: dominates should return true for unreachable UserInst.
-        if (!DT->isReachableFromEntry(UserInst->getParent()) ||
+        if (DT->isReachableFromEntry(UserInst->getParent()) &&
             DT->dominates(Inst, UserInst)) {
           Changed = true;
           Instruction *Replacement = Inst;

diff --git a/test/Transforms/ObjCARC/pr12270.ll b/test/Transforms/ObjCARC/pr12270.ll
index 30610f8694eddb8d3cd644d021e0346475158d7c..1faae5f68705e952f281f3c5fd759ff37b148d82 100644 (file)
--- a/test/Transforms/ObjCARC/pr12270.ll
+++ b/test/Transforms/ObjCARC/pr12270.ll
@@ -9,7 +9,13 @@ entry:
 return:                                           ; No predecessors!
   %bar = bitcast %2* %x to i8*
   %foo = call i8* @objc_autoreleaseReturnValue(i8* %bar) nounwind
+  call void @callee()
+  call void @use_pointer(i8* %foo)
+  call void @objc_release(i8* %foo) nounwind
   ret void
 }
 
 declare i8* @objc_autoreleaseReturnValue(i8*)
+declare void @objc_release(i8*)
+declare void @callee()
+declare void @use_pointer(i8*)