maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
John McCall 2010-10-06 18:56:43 +00:00
parent b4fb2a991c
commit 569eafce63
2 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/CodeGen/CGDecl.cpp
View File

@ -806,9 +806,8 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const VarDecl &D,
} }
// If this is a block variable, clean it up. // 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) 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) /// Emit an alloca (or GlobalValue depending on target)

41
clang/test/CodeGenObjC/blocks-2.m
View File

@ -1,12 +1,41 @@
// RUN: %clang_cc1 %s -emit-llvm -o %t -fobjc-gc -fblocks -triple i386-apple-darwin10 // We run this twice, once as Objective-C and once as Objective-C++.
// RUN: grep "objc_assign_strongCast" %t | count 2 // RUN: %clang_cc1 %s -emit-llvm -o - -fobjc-gc -fblocks -fexceptions -triple i386-apple-darwin10 | FileCheck %s
// RUN: %clang_cc1 -x objective-c++ %s -emit-llvm -o %t -fobjc-gc -fblocks -triple i386-apple-darwin10 // RUN: %clang_cc1 %s -emit-llvm -o - -fobjc-gc -fblocks -fexceptions -triple i386-apple-darwin10 -x objective-c++ | FileCheck %s
// RUN: grep "objc_assign_strongCast" %t | count 2
// 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; __block id result;
^{ result = x; }(); ^{ result = x; }();
return result; 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(
}