Author: zoltan
Date: 2007-05-10 15:09:08 -0400 (Thu, 10 May 2007)
New Revision: 77153
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/mini.c
Log:
2007-05-10 Zoltan Varga <[EMAIL PROTECTED]>
* mini.c (mono_method_to_ir): Disable AOT when calling
helper_compile_generic_method.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2007-05-10 19:07:39 UTC (rev 77152)
+++ trunk/mono/mono/mini/ChangeLog 2007-05-10 19:09:08 UTC (rev 77153)
@@ -1,3 +1,7 @@
+2007-05-10 Zoltan Varga <[EMAIL PROTECTED]>
+
+ * mini.c (mono_method_to_ir): Disable AOT when calling
helper_compile_generic_method.
+
2007-05-09 Zoltan Varga <[EMAIL PROTECTED]>
* mini.h (MonoCompile): Add 'args' field.
Modified: trunk/mono/mono/mini/mini.c
===================================================================
--- trunk/mono/mono/mini/mini.c 2007-05-10 19:07:39 UTC (rev 77152)
+++ trunk/mono/mono/mini/mini.c 2007-05-10 19:09:08 UTC (rev 77153)
@@ -4715,8 +4715,10 @@
this_arg_temp = mono_compile_create_var (cfg,
&mono_defaults.int_class->byval_arg, OP_LOCAL);
this_arg_temp->cil_code = ip;
+ /* Because of the PCONST below */
+ cfg->disable_aot = TRUE;
NEW_TEMPLOAD (cfg, iargs [0],
this_temp->inst_c0);
- NEW_PCONST (cfg, iargs [1], cmethod);
+ NEW_METHODCONST (cfg, iargs [1], cmethod);
NEW_PCONST (cfg, iargs [2],
mono_method_get_context (cmethod));
NEW_TEMPLOADA (cfg, iargs [3],
this_arg_temp->inst_c0);
temp = mono_emit_jit_icall (cfg, bblock,
mono_helper_compile_generic_method, iargs, ip);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
