Author: zoltan
Date: 2007-12-23 16:18:32 -0500 (Sun, 23 Dec 2007)
New Revision: 91843

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/mini-trampolines.c
Log:
2007-12-23  Zoltan Varga  <[EMAIL PROTECTED]>

        * mini-trampolines.c (mono_delegate_trampoline): Use 
mono_get_delegate_invoke ().


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2007-12-23 20:45:30 UTC (rev 91842)
+++ trunk/mono/mono/mini/ChangeLog      2007-12-23 21:18:32 UTC (rev 91843)
@@ -1,5 +1,7 @@
 2007-12-23  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * mini-trampolines.c (mono_delegate_trampoline): Use 
mono_get_delegate_invoke ().
+
        * aot-compiler.c (emit_klass_info): Avoid emitting info if one of the 
methods
        in the vtable can't be encoded.
        (compile_method): Ditto.

Modified: trunk/mono/mono/mini/mini-trampolines.c
===================================================================
--- trunk/mono/mono/mini/mini-trampolines.c     2007-12-23 20:45:30 UTC (rev 
91842)
+++ trunk/mono/mono/mini/mini-trampolines.c     2007-12-23 21:18:32 UTC (rev 
91843)
@@ -321,17 +321,11 @@
        MonoDomain *domain = mono_domain_get ();
        MonoDelegate *delegate;
        MonoJitInfo *ji;
-       gpointer iter;
        MonoMethod *invoke, *m;
        MonoMethod *method = NULL;
        gboolean multicast, callvirt;
 
-       /* Find the Invoke method */
-       iter = NULL;
-       while ((invoke = mono_class_get_methods (klass, &iter))) {
-               if (!strcmp (invoke->name, "Invoke"))
-                       break;
-       }
+       invoke = mono_get_delegate_invoke (klass);
        g_assert (invoke);
 
        /* Obtain the delegate object according to the calling convention */

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to