[gentoo-commits] gentoo-x86 commit in dev-lang/mono/files: mono-2.2-r121596-work-around-runtime-crash.patch

[Peter Alfredsen (loki_val)]

loki_val    09/01/20 13:51:44

  Added:                mono-2.2-r121596-work-around-runtime-crash.patch
  Log:
  Fix bug 255610, /usr/bin/mod doesn't work. Also include patch for upstream bug 458168, crasher bug that could be triggered during compilation.
  (Portage version: 2.2_rc22/cvs/Linux 2.6.28 x86_64)

Revision  Changes    Path
1.1                  dev-lang/mono/files/mono-2.2-r121596-work-around-runtime-crash.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mono/files/mono-2.2-r121596-work-around-runtime-crash.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-lang/mono/files/mono-2.2-r121596-work-around-runtime-crash.patch?rev=1.1&content-type=text/plain

Index: mono-2.2-r121596-work-around-runtime-crash.patch
===================================================================
Index: mono/metadata/metadata.c
===================================================================
--- mono/metadata/metadata.c	(Revision 121595)
+++ mono/metadata/metadata.c	(Revision 121596)
@@ -2178,9 +2178,11 @@
 	MonoImage *image = data;
 	MonoMethodInflated *method = key;
 
+	// FIXME:
+	// 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));
+		(method->context.method_inst && ginst_in_image (method->context.method_inst, image)) || signature_in_image (mono_method_signature ((MonoMethod*)method), image);
 }
 
 static gboolean