Author: martin
Date: 2006-01-18 12:31:33 -0500 (Wed, 18 Jan 2006)
New Revision: 55739

Modified:
   branches/mono-1-1-13/mono/mono/metadata/ChangeLog
   branches/mono-1-1-13/mono/mono/metadata/loader.c
Log:
**** Merged r55726 from HEAD ****

Modified: branches/mono-1-1-13/mono/mono/metadata/ChangeLog
===================================================================
--- branches/mono-1-1-13/mono/mono/metadata/ChangeLog   2006-01-18 17:23:15 UTC 
(rev 55738)
+++ branches/mono-1-1-13/mono/mono/metadata/ChangeLog   2006-01-18 17:31:33 UTC 
(rev 55739)
@@ -1,3 +1,10 @@
+2006-01-18  Martin Baulig  <[EMAIL PROTECTED]>
+
+       * loader.c (find_method_in_class): Added `gboolean is_inflated'
+       argument; if false, we compare the uninstantiated signatures.
+       (method_from_memberref): Compare the uninstantiated signatures;
+       fixes #76417.
+
 2006-01-18  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * metadata.c (mono_metadata_signature_dup): Applied patch from

Modified: branches/mono-1-1-13/mono/mono/metadata/loader.c
===================================================================
--- branches/mono-1-1-13/mono/mono/metadata/loader.c    2006-01-18 17:23:15 UTC 
(rev 55738)
+++ branches/mono-1-1-13/mono/mono/metadata/loader.c    2006-01-18 17:31:33 UTC 
(rev 55739)
@@ -326,32 +326,39 @@
 }
 
 static MonoMethod *
-find_method_in_class (MonoClass *klass, const char *name, const char *qname, 
const char *fqname, MonoMethodSignature *sig)
+find_method_in_class (MonoClass *klass, const char *name, const char *qname, 
const char *fqname,
+                     gboolean is_inflated, MonoMethodSignature *sig)
 {
        int i;
 
        mono_class_setup_methods (klass);
        for (i = 0; i < klass->method.count; ++i) {
-               MonoMethod *m = klass->methods [i];
+               MonoMethod *m, *orig_m;
 
+               m = orig_m = klass->methods [i];
+               if (!is_inflated && m->is_inflated)
+                       m = ((MonoMethodInflated *) m)->declaring;
+
                if (!((fqname && !strcmp (m->name, fqname)) ||
                      (qname && !strcmp (m->name, qname)) || !strcmp (m->name, 
name)))
                        continue;
 
                if (sig->call_convention == MONO_CALL_VARARG) {
                        if (mono_metadata_signature_vararg_match (sig, 
mono_method_signature (m)))
-                               return m;
+                               return orig_m;
                } else {
                        MonoMethodSignature *msig = mono_method_signature (m);
                        if (mono_metadata_signature_equal (sig, msig))
-                               return m;
+                               return orig_m;
                }
        }
+
        return NULL;
 }
 
 static MonoMethod *
-find_method (MonoClass *klass, MonoClass *ic, const char* name, 
MonoMethodSignature *sig)
+find_method (MonoClass *klass, MonoClass *ic, const char* name, gboolean 
is_inflated,
+            MonoMethodSignature *sig)
 {
        int i;
        char *qname, *fqname, *class_name;
@@ -372,7 +379,7 @@
                class_name = qname = fqname = NULL;
 
        while (klass) {
-               result = find_method_in_class (klass, name, qname, fqname, sig);
+               result = find_method_in_class (klass, name, qname, fqname, 
is_inflated, sig);
                if (result)
                        goto out;
 
@@ -382,7 +389,7 @@
                for (i = 0; i < klass->interface_count; i++) {
                        MonoClass *ic = klass->interfaces [i];
 
-                       result = find_method_in_class (ic, name, qname, fqname, 
sig);
+                       result = find_method_in_class (ic, name, qname, fqname, 
is_inflated, sig);
                        if (result)
                                goto out;
                }
@@ -391,7 +398,8 @@
        }
 
        if (is_interface)
-               result = find_method_in_class (mono_defaults.object_class, 
name, qname, fqname, sig);
+               result = find_method_in_class (
+                       mono_defaults.object_class, name, qname, fqname, 
is_inflated, sig);
 
  out:
        g_free (class_name);
@@ -532,18 +540,9 @@
 
        sig = mono_metadata_parse_method_signature (image, 0, ptr, NULL);
 
-       /* If the class is a generic instantiation, ensure that all VAR 
references in the signature
-          are replaced by the corresponding type argument.  Note that MVARs 
are left alone. */
-       if (klass->generic_class && sig->has_type_parameters) {
-               MonoMethodSignature *old_sig = sig;
-               sig = mono_class_inflate_generic_signature (image, sig, 
klass->generic_class->context);
-               g_assert (sig != old_sig);
-               mono_metadata_free_method_signature (old_sig);
-       }
-
        switch (class) {
        case MONO_MEMBERREF_PARENT_TYPEREF:
-               method = find_method (klass, NULL, mname, sig);
+               method = find_method (klass, NULL, mname, FALSE, sig);
                if (!method)
                        mono_loader_set_error_method_load (klass, mname);
                mono_metadata_free_method_signature (sig);
@@ -555,7 +554,7 @@
                type = &klass->byval_arg;
 
                if (type->type != MONO_TYPE_ARRAY && type->type != 
MONO_TYPE_SZARRAY) {
-                       method = find_method (klass, NULL, mname, sig);
+                       method = find_method (klass, NULL, mname, FALSE, sig);
                        if (!method)
                                g_warning ("Missing method %s in assembly %s, 
type %s", mname, image->name, mono_class_get_name (klass));
                        else if (klass->generic_class && (klass != 
method->klass))
@@ -601,7 +600,7 @@
                break;
        }
        case MONO_MEMBERREF_PARENT_TYPEDEF:
-               method = find_method (klass, NULL, mname, sig);
+               method = find_method (klass, NULL, mname, FALSE, sig);
                if (!method)
                        g_warning (
                                "Missing method %s::%s(%s) in assembly %s", 
@@ -1253,7 +1252,7 @@
        if (constrained_class->generic_class)
                gclass = constrained_class->generic_class;
 
-       result = find_method (constrained_class, ic, method->name, 
mono_method_signature (method));
+       result = find_method (constrained_class, ic, method->name, TRUE, 
mono_method_signature (method));
        if (!result)
                g_warning ("Missing method %s in assembly %s token %x", 
method->name,
                           image->name, token);

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

Reply via email to