diff options
| -rw-r--r-- | mono/metadata/ChangeLog | 7 | ||||
| -rw-r--r-- | mono/metadata/metadata.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index df7a0d68409..3e3ed4457f4 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,10 @@ +2009-12-01 Rodrigo Kumpera <rkumpera@novell.com> + + * metadata.c (inflated_method_in_image): Avoid calling + mono_method_signature () if the method does not already have a signature. + + Backport of r125724. + 2009-11-15 Zoltan Varga <vargaz@gmail.com> * boehm-gc.c (mono_gc_base_init): Applied patch from DKoushik K. Dutta ( diff --git a/mono/metadata/metadata.c b/mono/metadata/metadata.c index 101d581d107..ccb698f2ada 100644 --- a/mono/metadata/metadata.c +++ b/mono/metadata/metadata.c @@ -2197,7 +2197,7 @@ inflated_method_in_image (gpointer key, gpointer value, gpointer data) // https://bugzilla.novell.com/show_bug.cgi?id=458168 return method->declaring->klass->image == image || (method->context.class_inst && ginst_in_image (method->context.class_inst, image)) || - (method->context.method_inst && ginst_in_image (method->context.method_inst, image)) || signature_in_image (mono_method_signature ((MonoMethod*)method), image); + (method->context.method_inst && ginst_in_image (method->context.method_inst, image)) || (((MonoMethod*)method)->signature && signature_in_image (mono_method_signature ((MonoMethod*)method), image)); } static gboolean |