[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

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

diff --git a/lib/CodeGen/CGObjC.cpp b/lib/CodeGen/CGObjC.cpp
index d5906cf994ca6a5900ec1b0dfe705b3becd399b8..5b67565151361a74738654886eceb118d634976b 100644 (file)
--- a/lib/CodeGen/CGObjC.cpp
+++ b/lib/CodeGen/CGObjC.cpp
@@ -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",

diff --git a/test/CodeGenObjC/convert-messages-to-runtime-calls.m b/test/CodeGenObjC/convert-messages-to-runtime-calls.m
index 39a26475ea0bcc555e1d8994f439e54fca700682..d1a96249324c63aa7da08907cbaa6e3615616f71 100644 (file)
--- a/test/CodeGenObjC/convert-messages-to-runtime-calls.m
+++ b/test/CodeGenObjC/convert-messages-to-runtime-calls.m
@@ -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) {
+  }
+}