2008-10-21 Zoltan Varga <vargaz@gmail.com>

	* loader.c (find_method_in_class): Revert the last change for now as
	it breaks Mono.C5 unit tests.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index eb6370fcd06095440964e272e9c2bb96172c5522..c7f3e259acec45c8c685db99dabdd3b6c497076e 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,5 +1,8 @@
 2008-10-21  Zoltan Varga  <vargaz@gmail.com>
 
+       * loader.c (find_method_in_class): Revert the last change for now as
+       it breaks Mono.C5 unit tests.
+
        * class-internals.h (struct _MonoDynamicGenericClass): Add fields
        'field_generic_types' and 'field_objects' which contain the information
        previously stored in MonoInflatedField.

diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c
index a2c12a06da867eb0a1210c690fc4dc1497ae4756..717dd76ed5f033db88c017ee8b5846cf87061647 100644 (file)
--- a/mono/metadata/loader.c
+++ b/mono/metadata/loader.c
@@ -507,7 +507,10 @@ find_method_in_class (MonoClass *klass, const char *name, const char *qname, con
                      MonoMethodSignature *sig, MonoClass *from_class)
 {
        int i;
- 
+
+#if 0
+       /* FIXME: This causes test failures in Mono.C5 */
+
        /* Search directly in the metadata to avoid calling setup_methods () */
        if (klass->type_token && !klass->image->dynamic && !klass->methods && !klass->rank) {
                for (i = 0; i < klass->method.count; ++i) {
@@ -533,6 +536,7 @@ find_method_in_class (MonoClass *klass, const char *name, const char *qname, con
                        }
                }
        }
+#endif
 
        mono_class_setup_methods (klass);
        for (i = 0; i < klass->method.count; ++i) {