From: Mike Stump <mrs@apple.com>
Date: Tue, 21 Apr 2009 23:03:34 +0000 (+0000)
Subject: Resolve merge conflict better.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=914d3db20eb3126175f19901fadbbd7b268a3667;p=clang

Resolve merge conflict better.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@69748 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/Sema/block-misc.c b/test/Sema/block-misc.c
index dbcc253c58..d4b4088aee 100644
--- a/test/Sema/block-misc.c
+++ b/test/Sema/block-misc.c
@@ -112,14 +112,9 @@ void test11(int i) {
     ^{ break; }();     // expected-error {{'break' statement not in loop or switch statement}}
 }
 
-enum { LESS };
-
-void foo(long (^comp)()) {
-}
-
 void (^test12f)(void);
 void test12() {
-  foo(^{ return LESS; });	// expected-error {{incompatible block pointer types passing 'int (^)(void)', expected 'long (^)()'}}
+  test12f = ^test12f;	// expected-error {{type name requires a specifier or qualifier}} expected-error {{expected expression}}
 }
 
 // rdar://6808730
@@ -142,7 +137,12 @@ void test14() {
   };
 }
 
-void (^test90f)(void);
-void test90() {
-  test90f = ^test90f;	// expected-error {{type name requires a specifier or qualifier}} expected-error {{expected expression}}
+enum { LESS };
+
+void foo(long (^comp)()) {
+}
+
+void (^test15f)(void);
+void test15() {
+  foo(^{ return LESS; });	// expected-error {{incompatible block pointer types passing 'int (^)(void)', expected 'long (^)()'}}
 }