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, 68 insertions, 0 deletions

diff --git a/gcc/testsuite/objc/execute/exceptions/matcher-1.m b/gcc/testsuite/objc/execute/exceptions/matcher-1.m
new file mode 100644
index 000000000..ef0b627da
--- /dev/null
+++ b/gcc/testsuite/objc/execute/exceptions/matcher-1.m
@@ -0,0 +1,68 @@
+/* Test custom exception matchers  */
+/* Author: Nicola Pero */
+
+#ifdef __NEXT_RUNTIME__
+/* This test only runs for the GNU runtime.  TODO: It should work on
+   the NEXT runtime as well (needs testing).
+ */
+
+int main(void)
+{
+  return 0;
+}
+
+#else
+
+#include <objc/objc-api.h>
+#include <objc/objc-exception.h>
+#include <objc/Object.h>
+#include <stdlib.h>
+
+static unsigned int handlerExpected = 0;
+
+void
+my_exception_matcher(Class match_class, id exception)
+{
+  /* Always matches.  */
+  return 1;
+}
+
+@interface A : Object
+@end
+
+@implementation A
+@end
+
+@interface B : Object
+@end
+
+@implementation B
+@end
+
+int 
+main(int argc, char *argv[])
+{
+  objc_setExceptionMatcher (my_exception_matcher);
+
+  @try
+    {
+      @throw [A new];
+    }
+  @catch (B *exception)
+    {
+      /* Since we installed an exception matcher that always matches,
+	 the exception should be sent here even if it's of class A and
+	 this is looking for exceptions of class B.
+       */
+      return 0;
+    }
+  @catch (id exception)
+    {
+      abort ();
+    }
+
+  abort ();
+}
+
+
+#endif