obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 47 insertions, 0 deletions

diff --git a/gcc/testsuite/obj-c++.dg/method-conflict-4.mm b/gcc/testsuite/obj-c++.dg/method-conflict-4.mm
new file mode 100644
index 000000000..e2aca6cc5
--- /dev/null
+++ b/gcc/testsuite/obj-c++.dg/method-conflict-4.mm
@@ -0,0 +1,47 @@
+/* Contributed by Nicola Pero <nicola.pero@meta-innovation.com>, December 2010.  */
+/* { dg-do compile } */
+
+#include <objc/objc.h>
+
+/* Test that the compiler can correctly compare protocols in types of
+   method signatures.  In this test we look at protocols implementing
+   other protocols.  The fact that one protocol implements another one
+   doesn't mean that they are identical.  */
+
+@protocol A
+- (void) doSomething;
+@end
+
+@protocol B <A>
+- (void) doSomethingElse;
+@end
+
+@protocol C <A>
+- (void) doYetSomethingElse;
+@end
+
+@interface MyClass2
+- (void) aMethod: (id <A>)x;  /* { dg-message "previous declaration" } */
+- (void) aMethod: (id <B>)x;  /* { dg-error "duplicate declaration" } */
+
+- (void) bMethod: (id <B>)x;  /* { dg-message "previous declaration" } */
+- (void) bMethod: (id <A>)x;  /* { dg-error "duplicate declaration" } */
+
+- (void) cMethod: (id <A, B>)x;
+- (void) cMethod: (id <B>)x;  /* Ok - because if you implement B, then you also implement A, so <B> == <A, B> */
+
+- (void) dMethod: (id <A, B>)x;
+- (void) dMethod: (id <B, A>)x; /* Ok */
+
+- (void) eMethod: (id <A>)x;    /* { dg-message "previous declaration" } */
+- (void) eMethod: (id <B, C>)x; /* { dg-error "duplicate declaration" } */
+
+- (void) fMethod: (id <B, C>)x;    /* { dg-message "previous declaration" } */
+- (void) fMethod: (id <A>)x;       /* { dg-error "duplicate declaration" } */
+
+- (void) gMethod: (id <A>)x;       /* { dg-message "previous declaration" } */
+- (void) gMethod: (id <A, B, C>)x; /* { dg-error "duplicate declaration" } */
+
+- (void) hMethod: (id <A, B, C>)x; /* { dg-message "previous declaration" } */
+- (void) hMethod: (id <A>)x;       /* { dg-error "duplicate declaration" } */
+@end