Author: zoltan
Date: 2008-01-18 11:45:55 -0500 (Fri, 18 Jan 2008)
New Revision: 93274

Modified:
   trunk/mono/mono/mini/ChangeLog
   trunk/mono/mono/mini/mini-amd64.c
Log:
2008-01-18  Zoltan Varga  <[EMAIL PROTECTED]>

        * mini-amd64.c (mono_arch_emit_prolog): Disable the new optimization if
        profiling is enabled.


Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog      2008-01-18 16:41:44 UTC (rev 93273)
+++ trunk/mono/mono/mini/ChangeLog      2008-01-18 16:45:55 UTC (rev 93274)
@@ -1,5 +1,8 @@
 2008-01-18  Zoltan Varga  <[EMAIL PROTECTED]>
 
+       * mini-amd64.c (mono_arch_emit_prolog): Disable the new optimization if
+       profiling is enabled.
+       
        * mini-amd64.c (mono_arch_call_opcode): Emit the save_sp_to_lmf 
instruction at
        the end.
        (mono_arch_emit_prolog): Add more first bblock optimizations.

Modified: trunk/mono/mono/mini/mini-amd64.c
===================================================================
--- trunk/mono/mono/mini/mini-amd64.c   2008-01-18 16:41:44 UTC (rev 93273)
+++ trunk/mono/mono/mini/mini-amd64.c   2008-01-18 16:45:55 UTC (rev 93274)
@@ -4693,6 +4693,9 @@
                code = mono_arch_instrument_prolog (cfg, 
mono_trace_enter_method, code, TRUE);
        }
 
+       if (cfg->prof_options & MONO_PROFILE_ENTER_LEAVE)
+               args_clobbered = TRUE;
+
        /*
         * Optimize the common case of the first bblock making a call with the 
same
         * arguments as the method. This works because the arguments are still 
in their

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to