forked from OSchip/llvm-project
[CodeGen][ObjC] Emit invoke instead of call to call `objc_release` when
necessary. Prior to r349952, clang used to call objc_msgSend when sending a release messages, emitting an invoke instruction instead of a call instruction when it was necessary to catch an exception. That changed in r349952 because runtime function objc_release is called as a nounwind function, which broke programs that were overriding the dealloc method and throwing an exception from it. This patch restores the behavior prior to r349952. rdar://problem/50253394 Differential Revision: https://reviews.llvm.org/D61803 llvm-svn: 360474
This commit is contained in:
parent
7eb6b5ffc3
commit
34d28cf25f
|
@ -2631,7 +2631,7 @@ void CodeGenFunction::EmitObjCRelease(llvm::Value *value,
|
|||
value = Builder.CreateBitCast(value, Int8PtrTy);
|
||||
|
||||
// Call objc_release.
|
||||
llvm::CallInst *call = EmitNounwindRuntimeCall(fn, value);
|
||||
llvm::CallBase *call = EmitCallOrInvoke(fn, value);
|
||||
|
||||
if (precise == ARCImpreciseLifetime) {
|
||||
call->setMetadata("clang.imprecise_release",
|
||||
|
|
|
@ -175,3 +175,14 @@ float test_cannot_message_return_float(C *c) {
|
|||
|
||||
@end
|
||||
|
||||
@class Ety;
|
||||
|
||||
// CHECK-LABEL: define {{.*}}void @testException
|
||||
void testException(NSObject *a) {
|
||||
// MSGS: {{invoke.*@objc_msgSend}}
|
||||
// CALLS: invoke{{.*}}void @objc_release(i8* %
|
||||
@try {
|
||||
[a release];
|
||||
} @catch (Ety *e) {
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue