From: Nicola Pero <nicola.pero@meta-innovation.com>
Date: Tue, 24 May 2011 21:39:24 +0000 (+0000)
Subject: In libobjc/: 2011-05-24 Nicola Pero <nicola.pero@meta-innovation.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=85fe6408f42f51d9ce76b99893872800d17832aa;p=gcc.git

In libobjc/: 2011-05-24 Nicola Pero <nicola.pero@meta-innovation.com>

In libobjc/:
2011-05-24  Nicola Pero  <nicola.pero@meta-innovation.com>

	PR libobjc/48177
	* selector.c (__sel_register_typed_name): Use sel_types_match()
	instead of strcmp() to compare selector types (Suggestion by
	Richard Frith-Macdonald <rfm@gnu.org>).

In gcc/testsuite/:
2011-05-24  Nicola Pero  <nicola.pero@meta-innovation.com>

	PR libobjc/48177
	* objc.dg/pr48177.m: New testcase.

From-SVN: r174143
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bf257e06f36..c1dcaedaf65 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-24  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	PR libobjc/48177
+	* objc.dg/pr48177.m: New testcase.	
+
 2011-05-24  Nicola Pero  <nicola.pero@meta-innovation.com>
 
 	PR objc/48187
diff --git a/gcc/testsuite/objc.dg/pr48177.m b/gcc/testsuite/objc.dg/pr48177.m
new file mode 100644
index 00000000000..0d7ff2979c4
--- /dev/null
+++ b/gcc/testsuite/objc.dg/pr48177.m
@@ -0,0 +1,35 @@
+/* Contributed by Nicola Pero <nicola.pero@meta-innovation.com>, May 2011.  */
+/* { dg-do run } */
+/* { dg-skip-if "No API#2 pre-Darwin9" { *-*-darwin[5-8]* } { "-fnext-runtime" } { "" } } */
+
+#include <objc/runtime.h>
+#include <stdlib.h>
+
+int main(int argc, void **args)
+{
+#ifdef __GNU_LIBOBJC__
+  /* This special test tests that, if you have a selector already
+     registered in the runtime with full type information, you can use
+     sel_registerTypedName() to get it even if you specify the type
+     with incorrect argframe information.  This is helpful as
+     selectors generated by the compiler (which have correct argframe
+     information) are usually registered before hand-written ones
+     (which often have incorrect argframe information, but need the
+     correct one).
+
+     Note that in this hand-written test, even the type information of
+     the first selector may be wrong (on this machine); but that's OK
+     as we'll never actually use the selectors.  */
+  SEL selector1 = sel_registerTypedName ("testMethod", "i8@0:4");
+  SEL selector2 = sel_registerTypedName ("testMethod", "i8@8:8");
+  
+  /* We compare the selectors using ==, not using sel_isEqual().  This
+     is because we are testing internals of the runtime and we know
+     that in the current implementation they should be identical if
+     the stuff is to work as expected.  Don't do this at home.  */
+  if (selector1 != selector2)
+    abort ();
+#endif
+
+  return 0;
+}
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index a2917044290..1785ff165fa 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-24  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+	PR libobjc/48177
+	* selector.c (__sel_register_typed_name): Use sel_types_match()
+	instead of strcmp() to compare selector types (Suggestion by
+	Richard Frith-Macdonald <rfm@gnu.org>).
+
 2011-04-15  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	PR libobjc/32037
diff --git a/libobjc/selector.c b/libobjc/selector.c
index 80d2d800422..628b4f6f466 100644
--- a/libobjc/selector.c
+++ b/libobjc/selector.c
@@ -597,7 +597,7 @@ __sel_register_typed_name (const char *name, const char *types,
 		    return s;
 		}
 	    }
-	  else if (! strcmp (s->sel_types, types))
+	  else if (sel_types_match (s->sel_types, types))
 	    {
 	      if (orig)
 		{