commit 6ff0fc341f6d66b523d63b5d3fdfe00f6d4254fd
author Chris Lattner <sabre@nondot.org> Sun Nov 23 22:38:38 2008 +0000
committer Chris Lattner <sabre@nondot.org> Sun Nov 23 22:38:38 2008 +0000
tree 50fe9850991c12dcd2194d48d5ffd46dd7aa576a
parent 08631c5fa053867146b5ee8be658c229f6bf127c

Tweak duplicate category diagnostic to work like the duplicate protocol diagnostic.
Also, point out where the previous decl was.  This unxfails two tests.


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

test/SemaObjC/category-1.m

diff --git a/test/SemaObjC/category-1.m b/test/SemaObjC/category-1.m
index 8ba15d3..84f4c19 100644
--- a/test/SemaObjC/category-1.m
+++ b/test/SemaObjC/category-1.m
@@ -1,29 +1,28 @@
 // RUN: clang -fsyntax-only -verify %s
-// XFAIL
 
 @interface MyClass1 @end
 
 @protocol p1,p2,p3;
 
-@interface MyClass1 (Category1)  <p1> // expected-warning {{cannot find protocol definition for 'p1'}}
+@interface MyClass1 (Category1)  <p1> // expected-warning {{cannot find protocol definition for 'p1'}} expected-note {{previous definition is here}}
 @end
 
-@interface MyClass1 (Category1)  // expected-warning {{duplicate interface declaration for category 'MyClass1(Category1)'}}
+@interface MyClass1 (Category1)  // expected-warning {{duplicate definition of category 'Category1' on interface 'MyClass1'}}
 @end
 
 @interface MyClass1 (Category3) 
 @end
 
-@interface MyClass1 (Category4) @end
+@interface MyClass1 (Category4) @end // expected-note {{previous definition is here}}
 @interface MyClass1 (Category5) @end
 @interface MyClass1 (Category6) @end
-@interface MyClass1 (Category7) @end
-@interface MyClass1 (Category8) @end
+@interface MyClass1 (Category7) @end // expected-note {{previous definition is here}}
+@interface MyClass1 (Category8) @end // expected-note {{previous definition is here}}
 
 
-@interface MyClass1 (Category4) @end // expected-warning {{duplicate interface declaration for category 'MyClass1(Category4)'}}
-@interface MyClass1 (Category7) @end // expected-warning {{duplicate interface declaration for category 'MyClass1(Category7)'}}
-@interface MyClass1 (Category8) @end // expected-warning {{duplicate interface declaration for category 'MyClass1(Category8)'}}
+@interface MyClass1 (Category4) @end // expected-warning {{duplicate definition of category 'Category4' on interface 'MyClass1'}}
+@interface MyClass1 (Category7) @end // expected-warning {{duplicate definition of category 'Category7' on interface 'MyClass1'}}
+@interface MyClass1 (Category8) @end // expected-warning {{duplicate definition of category 'Category8' on interface 'MyClass1'}}
 
 
 @protocol p3 @end
@@ -45,10 +44,10 @@
 @interface XCRemoteComputerManager()
 @end
 
-@interface XCRemoteComputerManager(x) 
+@interface XCRemoteComputerManager(x) // expected-note {{previous definition is here}}
 @end 
 
-@interface XCRemoteComputerManager(x) // expected-warning {{duplicate interface declaration for category 'XCRemoteComputerManager(x)'}}
+@interface XCRemoteComputerManager(x) // expected-warning {{duplicate definition of category 'x' on interface 'XCRemoteComputerManager'}}
 @end
 
 @implementation XCRemoteComputerManager

test/SemaObjC/check-dup-objc-decls-1.m

diff --git a/test/SemaObjC/check-dup-objc-decls-1.m b/test/SemaObjC/check-dup-objc-decls-1.m
index 5f55cfd..a634d0e 100644
--- a/test/SemaObjC/check-dup-objc-decls-1.m
+++ b/test/SemaObjC/check-dup-objc-decls-1.m
@@ -1,5 +1,4 @@
 // RUN: clang -fsyntax-only -verify %s
-// XFAIL
 
 @interface Foo // expected-error {{previous definition is here}}
 @end
@@ -36,5 +35,5 @@
 @protocol PP<P> @end
 @protocol PP<Q> @end  // expected-error {{duplicate protocol declaration of 'PP'}}
 
-@interface A(Cat)<P> @end
-@interface A(Cat)<Q> @end // expected-warning {{duplicate interface declaration for category 'A(Cat)'}}
+@interface A(Cat)<P> @end // expected-note {{previous definition is here}}
+@interface A(Cat)<Q> @end // expected-warning {{duplicate definition of category 'Cat' on interface 'A'}}