diff options
| author | Dan Gohman <gohman@apple.com> | 2012-04-05 20:27:21 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2012-04-05 20:27:21 +0000 |
| commit | cc64bbca818f996ab43573b1c113d85bde15a420 (patch) | |
| tree | af170dfad46db1d37053dc3153b936e322caa9db /llvm | |
| parent | e8235fef3197e199ffd390eaf0e7cd039338c6a4 (diff) | |
| download | bcm5719-llvm-cc64bbca818f996ab43573b1c113d85bde15a420.tar.gz bcm5719-llvm-cc64bbca818f996ab43573b1c113d85bde15a420.zip | |
Fix accidentally inverted logic from r152803, and make the
testcase slightly less trivial. This fixes rdar://11171718.
llvm-svn: 154118
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Transforms/Scalar/ObjCARC.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/Transforms/ObjCARC/pr12270.ll | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Scalar/ObjCARC.cpp b/llvm/lib/Transforms/Scalar/ObjCARC.cpp index 80c1dd166ec..56e6c4c9574 100644 --- a/llvm/lib/Transforms/Scalar/ObjCARC.cpp +++ b/llvm/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/llvm/test/Transforms/ObjCARC/pr12270.ll b/llvm/test/Transforms/ObjCARC/pr12270.ll index 30610f8694e..1faae5f6870 100644 --- a/llvm/test/Transforms/ObjCARC/pr12270.ll +++ b/llvm/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*) |
