Several name lookup conflict detection fixes involving objective-c names.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@43000 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Sema/class-def-test-1.m b/test/Sema/class-def-test-1.m
index a33e965..91de54f 100644
--- a/test/Sema/class-def-test-1.m
+++ b/test/Sema/class-def-test-1.m
@@ -8,13 +8,14 @@
 
 @interface INTF @end // expected-error {{redefinition of 'INTF' as different kind of symbol}}
 
-@interface OBJECT @end
+@interface OBJECT @end	// expected-error {{previous definition is here}}
 
 @interface INTF1 : OBJECT @end
 
 @interface INTF1 : OBJECT @end // expected-error {{duplicate interface declaration for class 'INTF1'}
 
-typedef int OBJECT; // expected-error {{previous definition is here}}
+typedef int OBJECT; // expected-error {{previous definition is here}}  \
+		       expected-error {{redefinition of 'OBJECT' as different kind of symbol}}
 
 @interface INTF2 : OBJECT @end // expected-error {{redefinition of 'OBJECT' as different kind of symbol}}