Re-enable EH cleanups to destroy __block variables, now that we have a moment to

deal with the consequences.  Fixes rdar://problem/8224178.

llvm-svn: 115816

2 files changed, 36 insertions, 8 deletions

diff --git a/clang/lib/CodeGen/CGDecl.cpp b/clang/lib/CodeGen/CGDecl.cpp
index b743c0c6b4a..e1be2d29be4 100644
--- a/clang/lib/CodeGen/CGDecl.cpp
+++ b/clang/lib/CodeGen/CGDecl.cpp
@@ -806,9 +806,8 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const VarDecl &D,
   }
 
   // If this is a block variable, clean it up.
-  // FIXME: this should be an EH cleanup as well.  rdar://problem/8224178
   if (needsDispose && CGM.getLangOptions().getGCMode() != LangOptions::GCOnly)
-    EHStack.pushCleanup<CallBlockRelease>(NormalCleanup, DeclPtr);
+    EHStack.pushCleanup<CallBlockRelease>(NormalAndEHCleanup, DeclPtr);
 }
 
 /// Emit an alloca (or GlobalValue depending on target)
diff --git a/clang/test/CodeGenObjC/blocks-2.m b/clang/test/CodeGenObjC/blocks-2.m
index 0062e842648..e9132f33ec4 100644
--- a/clang/test/CodeGenObjC/blocks-2.m
+++ b/clang/test/CodeGenObjC/blocks-2.m
@@ -1,12 +1,41 @@
-// RUN: %clang_cc1 %s -emit-llvm -o %t -fobjc-gc -fblocks -triple i386-apple-darwin10
-// RUN: grep "objc_assign_strongCast" %t | count 2
-// RUN: %clang_cc1 -x objective-c++ %s -emit-llvm -o %t -fobjc-gc -fblocks -triple i386-apple-darwin10
-// RUN: grep "objc_assign_strongCast" %t | count 2
+// We run this twice, once as Objective-C and once as Objective-C++.
+// RUN: %clang_cc1 %s -emit-llvm -o - -fobjc-gc -fblocks -fexceptions -triple i386-apple-darwin10 | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - -fobjc-gc -fblocks -fexceptions -triple i386-apple-darwin10 -x objective-c++ | FileCheck %s
 
-// This should generate a strong cast.
 
-id test3(id x) {
+// CHECK: define i8* @{{.*}}test0
+// CHECK: define internal void @__test0_block_invoke_0(
+// CHECK:      call i8* @objc_assign_strongCast(
+// CHECK-NEXT: ret void
+id test0(id x) {
   __block id result;
   ^{ result = x; }();
   return result;
 }
+
+// <rdar://problem/8224178>: cleanup __block variables on EH path
+// CHECK: define void @{{.*}}test1
+void test1() {
+  extern void test1_help(void (^x)(void));
+
+  // CHECK:      [[N:%.*]] = alloca [[N_T:%.*]], align 8
+  // CHECK:      [[T0:%.*]] = getelementptr inbounds [[N_T]]* [[N]], i32 0, i32 4
+  // CHECK-NEXT: store double 1.000000e+01, double* [[T0]], align 8
+  __block double n = 10;
+
+  // CHECK:      invoke void @{{.*}}test1_help
+  test1_help(^{ n = 20; });
+
+  // CHECK:      [[FORWARDING:%.*]] = getelementptr inbounds [[N_T]]* [[N]], i32 0, i32 1
+  // CHECK-NEXT: [[T0:%.*]] = load [[N_T]]** [[FORWARDING]]
+  // CHECK-NEXT: [[T1:%.*]] = bitcast [[N_T]]* [[T0]] to i8*
+  // CHECK-NEXT: call void @_Block_object_dispose(i8* [[T1]], i32 8)
+  // CHECK-NEXT: ret void
+
+  // CHECK:      call i8* @llvm.eh.exception()
+  // CHECK:      [[FORWARDING:%.*]] = getelementptr inbounds [[N_T]]* [[N]], i32 0, i32 1
+  // CHECK-NEXT: [[T0:%.*]] = load [[N_T]]** [[FORWARDING]]
+  // CHECK-NEXT: [[T1:%.*]] = bitcast [[N_T]]* [[T0]] to i8*
+  // CHECK-NEXT: call void @_Block_object_dispose(i8* [[T1]], i32 8)
+  // CHECK:      call void @_Unwind_Resume_or_Rethrow(
+}