summaryrefslogtreecommitdiff
path: root/test/Modules/redecl-merge.m
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2012-01-01 21:47:52 +0000
committerDouglas Gregor <dgregor@apple.com>2012-01-01 21:47:52 +0000
commitdba9361891ab147b6ea658c1834bc1d660f5226b (patch)
tree5cad032d8abe46d14a32ecbad689e59d4bc292f3 /test/Modules/redecl-merge.m
parent49310ba7dca1df625f89baaa7c70bc4d6a36e80e (diff)
downloadclang-dba9361891ab147b6ea658c1834bc1d660f5226b.tar.gz
Implement declaration merging for Objective-C protocols across
multiple, disjoint modules. There is far too much duplicating with the ObjCInterfaceDecl case here, which I'll eliminate shortly. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@147417 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Modules/redecl-merge.m')
-rw-r--r--test/Modules/redecl-merge.m8
1 files changed, 8 insertions, 0 deletions
diff --git a/test/Modules/redecl-merge.m b/test/Modules/redecl-merge.m
index d7927396ca..4ea982b50f 100644
--- a/test/Modules/redecl-merge.m
+++ b/test/Modules/redecl-merge.m
@@ -6,6 +6,7 @@
@class C3;
__import_module__ redecl_merge_left;
+@protocol P4;
@class C3;
@class C3;
__import_module__ redecl_merge_right;
@@ -83,6 +84,13 @@ void g(A *a) {
[a init];
}
+@protocol P3
+- (void)p3_method;
+@end
+
+id<P4> p4;
+id<P3> p3;
+
#ifdef __cplusplus
void testVector() {
Vector<int> vec_int;