3 files changed, 18 insertions, 16 deletions
diff --git a/clang/test/CodeGen/blocks-1.c b/clang/test/CodeGen/blocks-1.c
index 1eb13063c68..350f7a3bafb 100644
--- a/clang/test/CodeGen/blocks-1.c
+++ b/clang/test/CodeGen/blocks-1.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 %s -emit-llvm -o %t -fblocks
 // RUN: grep "_Block_object_dispose" %t | count 17
-// RUN: grep "__copy_helper_block_" %t | count 16
-// RUN: grep "__destroy_helper_block_" %t | count 16
+// RUN: grep "__copy_helper_block_" %t | count 14
+// RUN: grep "__destroy_helper_block_" %t | count 14
 // RUN: grep "__Block_byref_object_copy_" %t | count 2
 // RUN: grep "__Block_byref_object_dispose_" %t | count 2
 // RUN: grep "i32 135)" %t | count 2
@@ -14,7 +14,7 @@ void test1() {
   int b=2;
   a=1;
   printf("a is %d, b is %d\n", a, b);
-  ^{ a = 10; printf("a is %d, b is %d\n", a, b); }();
+  ^{ a = 10; printf("a is %d, b is %d\n", a, b); }(); // needs copy/dispose
   printf("a is %d, b is %d\n", a, b);
   a = 1;
   printf("a is %d, b is %d\n", a, b);
@@ -24,8 +24,8 @@ void test2() {
   __block int a;
   a=1;
   printf("a is %d\n", a);
-  ^{
-    ^{
+  ^{ // needs copy/dispose
+    ^{ // needs copy/dispose
       a = 10;
     }();
   }();
@@ -37,13 +37,13 @@ void test2() {
 void test3() {
   __block int k;
   __block int (^j)(int);
-  ^{j=0; k=0;}();
+  ^{j=0; k=0;}(); // needs copy/dispose
 }
 
 int test4() {
   extern int g;
   static int i = 1;
-  ^(int j){ i = j; g = 0; }(0);
+  ^(int j){ i = j; g = 0; }(0); // does not need copy/dispose
   return i + g;
 }
 
@@ -51,19 +51,19 @@ int g;
 
 void test5() {
   __block struct { int i; } i;
-  ^{ (void)i; }();
+  ^{ (void)i; }(); // needs copy/dispose
 }
 
 void test6() {
   __block int i;
-  ^{ i=1; }();
-  ^{}();
+  ^{ i=1; }(); // needs copy/dispose
+  ^{}(); // does not need copy/dispose
 }
 
 void test7() {
-  ^{
+  ^{ // does not need copy/dispose
     __block int i;
-    ^{ i = 1; }();
+    ^{ i = 1; }(); // needs copy/dispose
   }();
 }
 
diff --git a/clang/test/CodeGen/blocksignature.c b/clang/test/CodeGen/blocksignature.c
index 26f2048bbcc..7526f19468e 100644
--- a/clang/test/CodeGen/blocksignature.c
+++ b/clang/test/CodeGen/blocksignature.c
@@ -6,9 +6,11 @@
 // X64: @.str1 = private unnamed_addr constant [12 x i8] c"i16@?0c8f12\00"
 // X64:   store i32 1073741824, i32*
 
-// X32: @.str = private unnamed_addr constant [6 x i8] c"v4@?0\00" 
-// X32: @__block_literal_global = internal constant %1 { i8** @_NSConcreteGlobalBlock, i32 1342177280,
-// X32: @.str1 = private unnamed_addr constant [11 x i8] c"i12@?0c4f8\00"
+// X32: [[STR1:@.*]] = private unnamed_addr constant [6 x i8] c"v4@?0\00" 
+// X32: @__block_descriptor_tmp = internal constant [[FULL_DESCRIPTOR_T:%.*]] { i32 0, i32 20, i8* getelementptr inbounds ([6 x i8]* [[STR1]], i32 0, i32 0), i8* null }
+// X32: @__block_literal_global = internal constant [[GLOBAL_LITERAL_T:%.*]] { i8** @_NSConcreteGlobalBlock, i32 1342177280, i32 0, i8* bitcast (void (i8*)* @__block_global_{{.*}} to i8*), [[DESCRIPTOR_T:%.*]]* bitcast ([[FULL_DESCRIPTOR_T]]* @__block_descriptor_tmp to {{%.*}}*) }
+// X32: [[STR2:@.*]] = private unnamed_addr constant [11 x i8] c"i12@?0c4f8\00"
+// X32: @__block_descriptor_tmp{{.*}} = internal constant [[FULL_DESCRIPTOR_T]] { i32 0, i32 24, i8* getelementptr inbounds ([11 x i8]* [[STR2]], i32 0, i32 0), i8* null }
 // X32:   store i32 1073741824, i32*
 
 // rdar://7635294
diff --git a/clang/test/CodeGen/blockstret.c b/clang/test/CodeGen/blockstret.c
index f630f22b167..e49b52a1885 100644
--- a/clang/test/CodeGen/blockstret.c
+++ b/clang/test/CodeGen/blockstret.c
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -fblocks -triple x86_64-apple-darwin9 %s -emit-llvm -o - | FileCheck %s -check-prefix=X64
 // RUN: %clang_cc1 -fblocks -triple i686-apple-darwin9 %s -emit-llvm -o - | FileCheck %s -check-prefix=X32
 
-// X64:   internal constant %2 { i8** @_NSConcreteGlobalBlock, i32 1879048192
+// X64:   internal constant {{%.*}} { i8** @_NSConcreteGlobalBlock, i32 1879048192
 // X64:     store i32 1610612736, i32* %want
 
 // X32:   @_NSConcreteGlobalBlock, i32 1879048192, i32 0,