2 files changed, 1 insertions, 33 deletions
diff --git a/clang/test/CodeGen/blocks-1.c b/clang/test/CodeGen/blocks-1.c
index d6fc1595208..f2677f3c275 100644
--- a/clang/test/CodeGen/blocks-1.c
+++ b/clang/test/CodeGen/blocks-1.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o %t -fblocks -f__block &&
+// RUN: clang-cc %s -emit-llvm -o %t -fblocks &&
 // RUN: grep "_Block_object_dispose" %t | count 15 &&
 // RUN: grep "__copy_helper_block_" %t | count 12 &&
 // RUN: grep "__destroy_helper_block_" %t | count 12 &&
diff --git a/clang/test/CodeGenObjC/blocks-unsupported.m b/clang/test/CodeGenObjC/blocks-unsupported.m
deleted file mode 100644
index e3faea995e6..00000000000
--- a/clang/test/CodeGenObjC/blocks-unsupported.m
+++ /dev/null
@@ -1,32 +0,0 @@
-// RUN: clang-cc -fblocks -fno-__block -fnext-runtime --emit-llvm -o %t %s -verify
-
-@class Foo;
-@protocol P;
-
-void t1()
-{
-  __block int a;
-  ^{ a = 10; }(); // expected-error {{cannot compile this __block variable in block literal yet}} expected-error {{cannot compile this block literal that requires copy/dispose yet}}
-
-  void (^block)(void);
-  ^{ (void)block; }(); // expected-error {{cannot compile this block pointer in block literal yet}} expected-error {{cannot compile this block literal that requires copy/dispose yet}}
-
-  struct Foo *__attribute__ ((NSObject)) foo;
-  ^{ (void)foo; }(); // expected-error {{cannot compile this __attribute__((NSObject)) variable in block literal yet}} expected-error {{cannot compile this block literal that requires copy/dispose yet}}
-
-  typedef struct CGColor * __attribute__ ((NSObject)) CGColorRef;
-  CGColorRef color;
-  ^{ (void)color; }(); // expected-error {{cannot compile this __attribute__((NSObject)) variable in block literal yet}} expected-error {{cannot compile this block literal that requires copy/dispose yet}}
-
-  id a1;
-  ^{ (void)a1; }(); // expected-error {{cannot compile this Objective-C variable in block literal yet}} expected-error {{cannot compile this block literal that requires copy/dispose yet}}
-
-  Foo *a2;
-  ^{ (void)a2; }(); // expected-error {{cannot compile this Objective-C variable in block literal yet}} expected-error {{cannot compile this block literal that requires copy/dispose yet}}
-
-  id<P> a3;
-  ^{ (void)a3; }(); // expected-error {{cannot compile this Objective-C variable in block literal yet}} expected-error {{cannot compile this block literal that requires copy/dispose yet}}
-
-  Foo<P> *a4;
-  ^{ (void)a4; }(); // expected-error {{cannot compile this Objective-C variable in block literal yet}} expected-error {{cannot compile this block literal that requires copy/dispose yet}}
-}