summaryrefslogtreecommitdiffstats
path: root/test/ASTMerge
diff options
context:
space:
mode:
authorArgyrios Kyrtzidis <akyrtzi@gmail.com>2011-10-04 04:48:02 +0000
committerArgyrios Kyrtzidis <akyrtzi@gmail.com>2011-10-04 04:48:02 +0000
commit1711fc91efb36d131f7ba771f73f0154dc1abd1f (patch)
treeea5f1805dd7f1a99b466b8bb45994dcb3f2041ac /test/ASTMerge
parent55d78d2a41bed08f222a1eebf4feebec60ba1056 (diff)
Improve location fidelity of objc decls.
-Add the location of the class name to all objc container decls, not just ObjCInterfaceDecl. -Make objc decls consistent with the rest of the NamedDecls and have getLocation() point to the class name, not the location of '@'. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@141061 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/ASTMerge')
-rw-r--r--test/ASTMerge/interface.m8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/ASTMerge/interface.m b/test/ASTMerge/interface.m
index e37e3807e5..747ef38223 100644
--- a/test/ASTMerge/interface.m
+++ b/test/ASTMerge/interface.m
@@ -4,7 +4,7 @@
// CHECK: interface2.m:16:9: error: instance variable 'ivar2' declared with incompatible types in different translation units ('float' vs. 'int')
// CHECK: interface1.m:16:7: note: declared here with type 'int'
-// CHECK: interface1.m:21:1: error: class 'I4' has incompatible superclasses
+// CHECK: interface1.m:21:12: error: class 'I4' has incompatible superclasses
// CHECK: interface1.m:21:17: note: inherits from superclass 'I2' here
// CHECK: interface2.m:21:17: note: inherits from superclass 'I1' here
// CHECK: interface2.m:33:1: error: class method 'foo' has incompatible result types in different translation units ('float' vs. 'int')
@@ -15,8 +15,8 @@
// CHECK: interface1.m:46:1: note: class method 'bar:' also declared here
// CHECK: interface2.m:57:20: error: instance method 'bar:' has a parameter with a different types in different translation units ('double' vs. 'float')
// CHECK: interface1.m:58:19: note: declared here with type 'float'
-// CHECK: interface1.m:100:1: error: class 'I15' has incompatible superclasses
-// CHECK: interface1.m:100:1: note: inherits from superclass 'I12' here
-// CHECK: interface2.m:99:1: note: inherits from superclass 'I11' here
+// CHECK: interface1.m:100:17: error: class 'I15' has incompatible superclasses
+// CHECK: interface1.m:100:17: note: inherits from superclass 'I12' here
+// CHECK: interface2.m:99:17: note: inherits from superclass 'I11' here
// CHECK: 8 errors generated