Merge forward-circular into protocol-test-2

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

diff --git a/test/SemaObjC/protocol-forward-circular.m b/test/SemaObjC/protocol-forward-circular.m
deleted file mode 100644 (file)
index 804c44f..0000000
--- a/test/SemaObjC/protocol-forward-circular.m
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: clang-cc -fsyntax-only -verify %s
-
-@protocol B;
-@protocol C < B > // expected-note{{previous definition is here}}
-@end
-@protocol A < C > 
-@end
-@protocol B < A > // expected-error{{protocol has circular dependency}}
-@end
-

diff --git a/test/SemaObjC/protocol-test-2.m b/test/SemaObjC/protocol-test-2.m
index 265e5d2691fe6c544081acc611ff999c7067b921..1ccc2de93e37eb7b84f1bd1ffbc319d77fb0b899 100644 (file)
--- a/test/SemaObjC/protocol-test-2.m
+++ b/test/SemaObjC/protocol-test-2.m
@@ -36,3 +36,14 @@
 @protocol YY <XX>  // Use of declaration of XX here should not cause a warning.
 - zz;
 @end
+
+
+// Detect circular dependencies.
+@protocol B;
+@protocol C < B > // expected-note{{previous definition is here}}
+@end
+@protocol A < C > 
+@end
+@protocol B < A > // expected-error{{protocol has circular dependency}}
+@end
+