2008-01-18 Zoltan Varga <vargaz@gmail.com>

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

svn path=/trunk/mono/; revision=93274

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 02879753581dca8899b516609af10375d6664fac..52e2e2db7f16549593f5d937a9391ebb2977e215 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,5 +1,8 @@
 2008-01-18  Zoltan Varga  <vargaz@gmail.com>
 
+       * 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.

diff --git a/mono/mini/mini-amd64.c b/mono/mini/mini-amd64.c
index 51babd31d1133c3477efe7bf1c1a435354e2ef0a..25fad4cd89818ff33ae5dc69658ca9170c074f8f 100644 (file)
--- a/mono/mini/mini-amd64.c
+++ b/mono/mini/mini-amd64.c
@@ -4693,6 +4693,9 @@ mono_arch_emit_prolog (MonoCompile *cfg)
                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