2010-01-20 Zoltan Varga <vargaz@gmail.com>

	* aot-compiler.c (encode_method_ref): Use mono_marshal_wrapper_info_from_wrapper
	() in one place.
	(mono_aot_wrapper_name): Remove the special handling of delegate invoke wrappers,
	its no longer needed.

svn path=/trunk/mono/; revision=149887

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index c6965e4c0ba83e5a597cccdcf0363c7ca9d5de24..e1552524fb9fc3cb7806808dbc454c182de0a4c0 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,10 @@
 2010-01-20  Zoltan Varga  <vargaz@gmail.com>
 
+       * aot-compiler.c (encode_method_ref): Use mono_marshal_wrapper_info_from_wrapper
+       () in one place.
+       (mono_aot_wrapper_name): Remove the special handling of delegate invoke wrappers,
+       its no longer needed.
+
        * method-to-ir.c (mono_method_to_ir): Fix a warning.
 
        * exceptions-<ARCH>.c: Introduce a MONO_ARCH_HAVE_THROW_EXCEPTION_BY_NAME

diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
index 941610e5b208e52dc05502d35aeba7db5d42ac5a..091119c0cac5da2b13dc323910a1a68190c585e1 100644 (file)
--- a/mono/mini/aot-compiler.c
+++ b/mono/mini/aot-compiler.c
@@ -1599,7 +1599,7 @@ encode_method_ref (MonoAotCompile *acfg, MonoMethod *method, guint8 *buf, guint8
                case MONO_WRAPPER_LDFLDA:
                case MONO_WRAPPER_STFLD:
                case MONO_WRAPPER_ISINST: {
-                       MonoClass *proxy_class = (MonoClass*)mono_marshal_method_from_wrapper (method);
+                       MonoClass *proxy_class = mono_marshal_wrapper_info_from_wrapper (method);
                        encode_klass_ref (acfg, proxy_class, p, &p);
                        break;
                }
@@ -4557,12 +4557,6 @@ mono_aot_wrapper_name (MonoMethod *method)
                else
                        name = g_strdup_printf ("%s (%s)", method->name, tmpsig);
                break;
-       case MONO_WRAPPER_DELEGATE_INVOKE:
-       case MONO_WRAPPER_DELEGATE_BEGIN_INVOKE:
-       case MONO_WRAPPER_DELEGATE_END_INVOKE:
-               /* This is a hack to work around the fact that these wrappers get assigned to some random class */
-               name = g_strdup_printf ("%s (%s)", method->name, tmpsig);
-               break;
        default:
                klass_desc = mono_type_full_name (&method->klass->byval_arg);
                name = g_strdup_printf ("%s:%s (%s)", klass_desc, method->name, tmpsig);