From ddfc8a1e68ac67d748ca918acac8f1c78a51395c Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Tue, 19 Jun 2012 20:53:26 +0000
Subject: [PATCH] objc-arc: captured block variable accessed in its block
literal initializer need be null initialized before initializer takes hold,
just like any other initialized retainable object pointer. // rdar://11016025
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@158738 91177308-0d34-0410-b5e6-96231b3b80d8
---
lib/CodeGen/CGDecl.cpp | 8 ++++++++
test/CodeGenObjC/arc-blocks.m | 11 +++++++++++
2 files changed, 19 insertions(+)
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp
index 4d4b57904c4..ff803c612fb 100644
--- a/lib/CodeGen/CGDecl.cpp
+++ b/lib/CodeGen/CGDecl.cpp
@@ -490,6 +490,14 @@ static bool isAccessedBy(const VarDecl &var, const Stmt *s) {
if (const DeclRefExpr *ref = dyn_cast<DeclRefExpr>(e))
return (ref->getDecl() == &var);
+ if (const BlockExpr *be = dyn_cast<BlockExpr>(e)) {
+ const BlockDecl *block = be->getBlockDecl();
+ for (BlockDecl::capture_const_iterator i = block->capture_begin(),
+ e = block->capture_end(); i != e; ++i) {
+ if (i->getVariable() == &var)
+ return true;
+ }
+ }
}
for (Stmt::const_child_range children = s->children(); children; ++children)
diff --git a/test/CodeGenObjC/arc-blocks.m b/test/CodeGenObjC/arc-blocks.m
index 06acf01ce0f..1092a8712d8 100644
--- a/test/CodeGenObjC/arc-blocks.m
+++ b/test/CodeGenObjC/arc-blocks.m
@@ -521,3 +521,14 @@ void test15_helper(void (^block)(void), int x);
void test15(int a) {
test15_helper(^{ (void) a; }, ({ a; }));
}
+
+// rdar://11016025
+void test16() {
+ void (^BLKVAR)(void) = ^{ BLKVAR(); };
+
+ // CHECK: define void @test16(
+ // CHECK: [[BLKVAR:%.*]] = alloca void ()*, align 8
+ // CHECK-NEXT: [[BLOCK:%.*]] = alloca [[BLOCK_T:<{.*}>]],
+ // CHECK-NEXT: [[SLOTREL:%.*]] = getelementptr inbounds [[BLOCK_T]]* [[BLOCK]], i32 0, i32 5
+ // CHECK-NEXT: store void ()* null, void ()** [[BLKVAR]], align 8
+}
--
GitLab