When an invoke is marked with metadata indicating its unwind edge

should be ignored by ARC optimization, don't insert new ARC runtime
calls in the unwind destination.

llvm-svn: 152748
This commit is contained in:
Dan Gohman 2012-03-14 23:05:06 +00:00
parent 632c8aec93
commit a30e1f4576
2 changed files with 38 additions and 1 deletions

View File

@ -3041,7 +3041,8 @@ void ObjCARCOpt::MoveCalls(Value *Arg,
// but our releases will never depend on it, because they must be
// paired with retains from before the invoke.
InsertPts[0] = II->getNormalDest()->getFirstInsertionPt();
InsertPts[1] = II->getUnwindDest()->getFirstInsertionPt();
if (!II->getMetadata(NoObjCARCExceptionsMDKind))
InsertPts[1] = II->getUnwindDest()->getFirstInsertionPt();
} else {
// Insert code immediately after the last use.
InsertPts[0] = llvm::next(BasicBlock::iterator(LastUse));

View File

@ -2,6 +2,7 @@
declare i8* @objc_retain(i8*)
declare void @objc_release(i8*)
declare i8* @objc_retainAutoreleasedReturnValue(i8*)
declare i8* @objc_msgSend(i8*, i8*, ...)
declare void @use_pointer(i8*)
declare void @callee()
@ -68,6 +69,41 @@ done:
ret void
}
; The optimizer should ignore invoke unwind paths consistently.
; PR12265
; CHECK: define void @test2() {
; CHECK: invoke.cont:
; CHECK-NEXT: call i8* @objc_retain
; CHEK-NOT: @objc
; CHECK: finally.cont:
; CHECK-NEXT: call void @objc_release
; CHEK-NOT: @objc
; CHECK: finally.rethrow:
; CHEK-NOT: @objc
; CHECK: }
define void @test2() {
entry:
%call = invoke i8* bitcast (i8* (i8*, i8*, ...)* @objc_msgSend to i8* ()*)()
to label %invoke.cont unwind label %finally.rethrow, !clang.arc.no_objc_arc_exceptions !0
invoke.cont: ; preds = %entry
%tmp1 = tail call i8* @objc_retainAutoreleasedReturnValue(i8* %call) nounwind
call void bitcast (i8* (i8*, i8*, ...)* @objc_msgSend to void ()*)(), !clang.arc.no_objc_arc_exceptions !0
invoke void @use_pointer(i8* %call)
to label %finally.cont unwind label %finally.rethrow, !clang.arc.no_objc_arc_exceptions !0
finally.cont: ; preds = %invoke.cont
tail call void @objc_release(i8* %call) nounwind, !clang.imprecise_release !0
ret void
finally.rethrow: ; preds = %invoke.cont, %entry
%tmp2 = landingpad { i8*, i32 } personality i8* bitcast (i32 (...)* @__objc_personality_v0 to i8*)
catch i8* null
unreachable
}
declare i32 @__gxx_personality_v0(...)
declare i32 @__objc_personality_v0(...)
!0 = metadata !{}