* Headers/Foundation/NSMethodSignature.h

(_internalMethodTypes): New instance variable.
        * Source/NSMethodSignature.m: ([+signatureWithObjCTypes]): Store
        the runtime signature separately from the mframe signature.
        Document.
        ([-dealloc]): Free new instance variable.
        ([-methodInfo]): Use _internalMethodTypes to build argument
        information.

        * Source/GSFFCallInvocation.m (GSInvocationCallback)
        * Source/GSFFIInvocation.m (GSInvocationCallback): Use the
        selector registered in the runtime for the receiver instead of
        the constructed selector from the stack to avoid mismatches in the
        runtime.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@19662 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,20 @@
+2004-07-01  David Ayers  <d.ayers@inode.at>
+
+	* Headers/Foundation/NSMethodSignature.h
+	(_internalMethodTypes): New instance variable.
+	* Source/NSMethodSignature.m: ([+signatureWithObjCTypes]): Store
+	the runtime signature separately from the mframe signature.
+	Document.
+	([-dealloc]): Free new instance variable.
+	([-methodInfo]): Use _internalMethodTypes to build argument
+	information.
+
+	* Source/GSFFCallInvocation.m (GSInvocationCallback)
+	* Source/GSFFIInvocation.m (GSInvocationCallback): Use the
+	selector registered in the runtime for the receiver instead of the
+	constructed selector from the stack to avoid mismatches in the
+	runtime.
+
 2004-06-29 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSUserDefaults.m: Added MacOS-X compatibility methods ..

Headers/Foundation/NSMethodSignature.h

@@ -76,11 +76,12 @@ typedef struct	{
   const char		*_methodTypes;
   unsigned		_argFrameLength;
   unsigned		_numArgs;
-#ifdef	STRICT_MACOS_X
+#ifdef STRICT_MACOS_X
   void			*_dummy;
 #else
   NSArgumentInfo	*_info;
 #endif
+  const char		*_internalMethodTypes;
 }
 
 /**

Source/GSFFCallInvocation.m

@@ -774,6 +774,7 @@ GSInvocationCallback (void *callback_data, va_alist args)
   int			i;
   int			num_args;
   void			*retval;
+  const char            *selectorName;
   vacallReturnTypeInfo	*typeinfo;
   NSArgumentInfo	*info;
   GSFFCallInvocation	*invocation;
@@ -795,6 +796,24 @@ GSInvocationCallback (void *callback_data, va_alist args)
   obj      = va_arg_ptr(args, id);
   selector = va_arg_ptr(args, SEL);
 
+  /* Fetch the selector from the runtime 
+     to get the portable type information later.  */
+  selectorName = sel_get_name(selector);
+  selector = sel_get_uid(selectorName);
+
+  if (!selector)
+    {
+      /* The selector is not registered with the runtime.  It seems 
+	 safe to assume that the receiver does not respond to it which
+	 would happen if we created a selector with the 'correct' types 
+	 and registered it manually.  So let us raise the corresponding
+	 exception.  */
+      [NSException raise: NSGenericException
+		   format: @"%s does not recognize %s",
+		   GSClassNameFromObject(obj), 
+		   selectorName ? selectorName : "(null)"];
+    }
+
   fwdInvMethod = gs_method_for_receiver_and_selector
     (obj, @selector (forwardInvocation:));
   

Source/GSFFIInvocation.m

@@ -406,6 +406,7 @@ GSFFIInvocationCallback(ffi_cif *cif, void *retp, void **args, void *user)
 {
   id			obj;
   SEL			selector;
+  const char            *selectorName;
   GSFFIInvocation	*invocation;
   NSMethodSignature	*sig;
   GSMethod              fwdInvMethod;
@@ -413,6 +414,23 @@ GSFFIInvocationCallback(ffi_cif *cif, void *retp, void **args, void *user)
   obj      = *(id *)args[0];
   selector = *(SEL *)args[1];
 
+  /* Fetch the selector from the runtime 
+     to get the portable type information later.  */
+  selectorName = sel_get_name(selector);
+  selector = sel_get_uid(selectorName);
+
+  if (!selector)
+    {
+      /* The selector is not registered with the runtime.  It seems 
+	 safe to assume that the receiver does not respond to it which
+	 would happen if we created a selector with the 'correct' types 
+	 and registered it manually.  So let us raise the corresponding
+	 exception.  */
+      [NSException raise: NSGenericException
+		   format: @"%s does not recognize %s",
+		   GSClassNameFromObject(obj), 
+		   selectorName ? selectorName : "(null)"];
+    }
   fwdInvMethod = gs_method_for_receiver_and_selector
     (obj, @selector (forwardInvocation:));
   

Source/NSMethodSignature.m

@@ -28,7 +28,8 @@
 
 #include "config.h"
 #include "GNUstepBase/preface.h"
-#include <mframe.h>
+#include "mframe.h"
+#include <string.h>
 
 #include "Foundation/NSMethodSignature.h"
 #include "Foundation/NSException.h"
@@ -37,6 +38,15 @@
 
 @implementation NSMethodSignature
 
+/**
+ * Returns a method signature with the corresponding ObjC types.  This
+ * type string must correspond to a type string recognized by the
+ * runtime which is a platform independent representation.  Internally
+ * this is transformed to a platform specific representation used 
+ * to generate the NSArgumentInfo structures.  You should never need 
+ * to access this internal representation and it should not be passed
+ * to this method.
+ */
 + (NSMethodSignature*) signatureWithObjCTypes: (const char*)t
 {
   NSMethodSignature *newMs;
@@ -46,8 +56,10 @@
       return nil;
     }
   newMs = AUTORELEASE([NSMethodSignature alloc]);
-  newMs->_methodTypes = mframe_build_signature(t, &newMs->_argFrameLength,
-    &newMs->_numArgs, 0); 
+  newMs->_methodTypes = NSZoneMalloc(NSDefaultMallocZone(), strlen(t) + 1);
+  strcpy ((char *)newMs->_methodTypes, t);
+  newMs->_internalMethodTypes 
+    = mframe_build_signature(t, &newMs->_argFrameLength, &newMs->_numArgs, 0); 
 
   return newMs;
 }
@@ -121,6 +133,8 @@
 {
   if (_methodTypes)
     NSZoneFree(NSDefaultMallocZone(), (void*)_methodTypes);
+  if (_internalMethodTypes)
+    NSZoneFree(NSDefaultMallocZone(), (void*)_internalMethodTypes);
   if (_info)
     NSZoneFree(NSDefaultMallocZone(), (void*)_info);
   [super dealloc];
@@ -168,7 +182,7 @@
 {
   if (_info == 0)
     {
-      const char	*types = _methodTypes;
+      const char	*types = _internalMethodTypes;
       unsigned int	i;
 
       _info = NSZoneMalloc(NSDefaultMallocZone(),