From 7191a36c90cbf3e77c68d494f63926219135f17c Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Fri, 30 May 2008 16:58:58 +0000 Subject: [PATCH] 2008-05-30 Zoltan Varga * mini-amd64.c (mono_arch_emit_prolog): Increase max_offset when processing bb_exit instead, since out of line bblocks might not actually be emitted out-of-line. svn path=/trunk/mono/; revision=104556 --- mono/mini/ChangeLog | 4 ++++ mono/mini/mini-amd64.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 26f36e165b1..d9085b94e45 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,5 +1,9 @@ 2008-05-30 Zoltan Varga + * mini-amd64.c (mono_arch_emit_prolog): Increase max_offset when processing + bb_exit instead, since out of line bblocks might not actually be emitted + out-of-line. + * mini-amd64.c (mono_arch_emit_prolog): Increase bb->max_offset by the maximum epilog size for out of line bblocks if tracing is enabled. diff --git a/mono/mini/mini-amd64.c b/mono/mini/mini-amd64.c index 596e99dee48..98b6fa03b6d 100644 --- a/mono/mini/mini-amd64.c +++ b/mono/mini/mini-amd64.c @@ -4030,9 +4030,9 @@ mono_arch_emit_prolog (MonoCompile *cfg) max_offset += ((guint8 *)ins_get_spec (ins->opcode))[MONO_INST_LEN]; } - if (mono_jit_trace_calls && bb->out_of_line) + if (mono_jit_trace_calls && bb == cfg->bb_exit) /* The tracing code can be quite large */ - bb->max_offset += max_epilog_size; + max_offset += max_epilog_size; } } -- 2.25.1