From b4f562d82cbab8485391f1e5b5294935b13559e0 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Tue, 19 Nov 2013 15:24:46 +0100 Subject: [PATCH] [amd64] Remove the unused 'method' field from MonoLMF. --- mono/mini/mini-amd64.c | 1 - mono/mini/mini-amd64.h | 2 -- mono/mini/tramp-amd64.c | 7 ------- 3 files changed, 10 deletions(-) diff --git a/mono/mini/mini-amd64.c b/mono/mini/mini-amd64.c index a1c7872e9ec..dcacca0509e 100644 --- a/mono/mini/mini-amd64.c +++ b/mono/mini/mini-amd64.c @@ -3742,7 +3742,6 @@ emit_setup_lmf (MonoCompile *cfg, guint8 *code, gint32 lmf_offset, int cfa_offse /* These can't contain refs */ mini_gc_set_slot_type_from_fp (cfg, lmf_offset + G_STRUCT_OFFSET (MonoLMF, previous_lmf), SLOT_NOREF); mini_gc_set_slot_type_from_fp (cfg, lmf_offset + G_STRUCT_OFFSET (MonoLMF, lmf_addr), SLOT_NOREF); - mini_gc_set_slot_type_from_fp (cfg, lmf_offset + G_STRUCT_OFFSET (MonoLMF, method), SLOT_NOREF); mini_gc_set_slot_type_from_fp (cfg, lmf_offset + G_STRUCT_OFFSET (MonoLMF, rip), SLOT_NOREF); mini_gc_set_slot_type_from_fp (cfg, lmf_offset + G_STRUCT_OFFSET (MonoLMF, rsp), SLOT_NOREF); diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h index cb590add880..d88af38ce11 100644 --- a/mono/mini/mini-amd64.h +++ b/mono/mini/mini-amd64.h @@ -167,8 +167,6 @@ struct MonoLMF { */ gpointer previous_lmf; gpointer lmf_addr; - /* This is only set in trampoline LMF frames */ - MonoMethod *method; #if defined(__default_codegen__) || defined(HOST_WIN32) guint64 rip; #elif defined(__native_client_codegen__) diff --git a/mono/mini/tramp-amd64.c b/mono/mini/tramp-amd64.c index 2e92b35b6b8..5ab286fab20 100644 --- a/mono/mini/tramp-amd64.c +++ b/mono/mini/tramp-amd64.c @@ -599,13 +599,6 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf amd64_mov_reg_reg (code, AMD64_R11, AMD64_RSP, sizeof(mgreg_t)); amd64_alu_reg_imm (code, X86_ADD, AMD64_R11, framesize + 16); amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, rsp), AMD64_R11, sizeof(mgreg_t)); - /* Save method */ - if (tramp_type == MONO_TRAMPOLINE_JIT || tramp_type == MONO_TRAMPOLINE_JUMP) { - amd64_mov_reg_membase (code, AMD64_R11, AMD64_RBP, arg_offset, sizeof(gpointer)); - amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, method), AMD64_R11, sizeof(gpointer)); - } else { - amd64_mov_membase_imm (code, AMD64_RBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, method), 0, sizeof(gpointer)); - } /* Save callee saved regs */ #ifdef TARGET_WIN32 amd64_mov_membase_reg (code, AMD64_RBP, lmf_offset + G_STRUCT_OFFSET (MonoLMF, rdi), AMD64_RDI, sizeof(mgreg_t)); -- 2.25.1