Author: zoltan
Date: 2006-01-31 15:23:01 -0500 (Tue, 31 Jan 2006)
New Revision: 56359
Modified:
branches/mono-1-1-13/mono/mono/mini/ChangeLog
branches/mono-1-1-13/mono/mono/mini/mini-amd64.c
Log:
Merge from HEAD.
Modified: branches/mono-1-1-13/mono/mono/mini/ChangeLog
===================================================================
--- branches/mono-1-1-13/mono/mono/mini/ChangeLog 2006-01-31 20:19:59 UTC
(rev 56358)
+++ branches/mono-1-1-13/mono/mono/mini/ChangeLog 2006-01-31 20:23:01 UTC
(rev 56359)
@@ -1,3 +1,8 @@
+2006-01-31 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * mini-amd64.c (mono_arch_compute_omit_fp): Avoid hitting an assertion
+ on very large methods.
+
2006-01-23 Martin Baulig <[EMAIL PROTECTED]>
* Makefile.am: Only compile debug-debugger.c on supported platforms.
Modified: branches/mono-1-1-13/mono/mono/mini/mini-amd64.c
===================================================================
--- branches/mono-1-1-13/mono/mono/mini/mini-amd64.c 2006-01-31 20:19:59 UTC
(rev 56358)
+++ branches/mono-1-1-13/mono/mono/mini/mini-amd64.c 2006-01-31 20:23:01 UTC
(rev 56359)
@@ -843,6 +843,11 @@
}
}
+ if (cfg->num_varinfo > 10000) {
+ /* Avoid hitting the stack_alloc_size < (1 << 16) assertion in
emit_epilog () */
+ cfg->arch.omit_fp = FALSE;
+ }
+
g_free (cinfo);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
