From ad7d62eb22c6214f9fd2164dbb77e8869d6450b5 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Sun, 31 Jan 2016 00:19:51 -0500 Subject: [PATCH] [jit] Remove unused MONO_PATCH_INFO_MONITOR_ENTER/EXIT. --- mono/mini/mini-llvm.c | 5 ----- mono/mini/mini-s390x.c | 3 --- mono/mini/mini-x86.c | 3 --- mono/mini/mini.h | 2 +- mono/mini/patch-info.h | 3 --- 5 files changed, 1 insertion(+), 15 deletions(-) diff --git a/mono/mini/mini-llvm.c b/mono/mini/mini-llvm.c index d65687dab13..ba52497fd42 100644 --- a/mono/mini/mini-llvm.c +++ b/mono/mini/mini-llvm.c @@ -3165,11 +3165,6 @@ process_call (EmitContext *ctx, MonoBasicBlock *bb, LLVMBuilderRef *builder_ref, * FIXME: Some trampolines might have * their own calling convention on some platforms. */ -#ifndef TARGET_AMD64 - if (abs_ji->type == MONO_PATCH_INFO_MONITOR_ENTER || abs_ji->type == MONO_PATCH_INFO_MONITOR_ENTER_V4 || - abs_ji->type == MONO_PATCH_INFO_MONITOR_EXIT) - LLVM_FAILURE (ctx, "trampoline with own cconv"); -#endif target = mono_resolve_patch_target (cfg->method, cfg->domain, NULL, abs_ji, FALSE); LLVMAddGlobalMapping (ctx->module->ee, callee, target); } diff --git a/mono/mini/mini-s390x.c b/mono/mini/mini-s390x.c index 368c3bc9882..3b81c221dab 100644 --- a/mono/mini/mini-s390x.c +++ b/mono/mini/mini-s390x.c @@ -5407,9 +5407,6 @@ mono_arch_patch_code (MonoCompile *cfg, MonoMethod *method, MonoDomain *domain, case MONO_PATCH_INFO_INTERNAL_METHOD: case MONO_PATCH_INFO_JIT_ICALL_ADDR: case MONO_PATCH_INFO_RGCTX_FETCH: - case MONO_PATCH_INFO_MONITOR_ENTER: - case MONO_PATCH_INFO_MONITOR_ENTER_V4: - case MONO_PATCH_INFO_MONITOR_EXIT: case MONO_PATCH_INFO_ABS: { S390_EMIT_CALL (ip, target); continue; diff --git a/mono/mini/mini-x86.c b/mono/mini/mini-x86.c index 03e2eca5272..0407c7cc57e 100644 --- a/mono/mini/mini-x86.c +++ b/mono/mini/mini-x86.c @@ -5130,9 +5130,6 @@ mono_arch_patch_code_new (MonoCompile *cfg, MonoDomain *domain, guint8 *code, Mo case MONO_PATCH_INFO_BB: case MONO_PATCH_INFO_LABEL: case MONO_PATCH_INFO_RGCTX_FETCH: - case MONO_PATCH_INFO_MONITOR_ENTER: - case MONO_PATCH_INFO_MONITOR_ENTER_V4: - case MONO_PATCH_INFO_MONITOR_EXIT: case MONO_PATCH_INFO_JIT_ICALL_ADDR: #if defined(__native_client_codegen__) && defined(__native_client__) if (nacl_is_code_address (code)) { diff --git a/mono/mini/mini.h b/mono/mini/mini.h index db5c133266f..e7a9d148a21 100644 --- a/mono/mini/mini.h +++ b/mono/mini/mini.h @@ -114,7 +114,7 @@ #endif /* Version number of the AOT file format */ -#define MONO_AOT_FILE_VERSION 131 +#define MONO_AOT_FILE_VERSION 132 //TODO: This is x86/amd64 specific. #define mono_simd_shuffle_mask(a,b,c,d) ((a) | ((b) << 2) | ((c) << 4) | ((d) << 6)) diff --git a/mono/mini/patch-info.h b/mono/mini/patch-info.h index a29cdafe800..229680d292a 100644 --- a/mono/mini/patch-info.h +++ b/mono/mini/patch-info.h @@ -36,9 +36,6 @@ PATCH_INFO(INTERRUPTION_REQUEST_FLAG, "interruption_request_flag") PATCH_INFO(METHOD_RGCTX, "method_rgctx") PATCH_INFO(RGCTX_FETCH, "rgctx_fetch") PATCH_INFO(RGCTX_SLOT_INDEX, "rgctx_slot_index") -PATCH_INFO(MONITOR_ENTER, "monitor_enter") -PATCH_INFO(MONITOR_ENTER_V4, "monitor_enter_v4") -PATCH_INFO(MONITOR_EXIT, "monitor_exit") PATCH_INFO(MSCORLIB_GOT_ADDR, "mscorlib_got_addr") PATCH_INFO(SEQ_POINT_INFO, "seq_point_info") PATCH_INFO(GC_CARD_TABLE_ADDR, "gc_card_table_addr") -- 2.25.1