From d2f5942cad1b3700ccd74be84e069da255d5f086 Mon Sep 17 00:00:00 2001 From: Jay Krell Date: Fri, 19 Jul 2019 11:40:54 -0700 Subject: [PATCH] Remove mono_arch_free_jit_tls_data. (mono/mono#15662) Commit migrated from https://github.com/mono/mono/commit/3e432663cde4283fc7fa7f81b20bc3d0a9333b38 --- src/mono/mono/mini/mini-amd64.c | 5 ----- src/mono/mono/mini/mini-arm.c | 5 ----- src/mono/mono/mini/mini-arm64.c | 5 ----- src/mono/mono/mini/mini-mips.c | 5 ----- src/mono/mono/mini/mini-ppc.c | 5 ----- src/mono/mono/mini/mini-riscv.c | 5 ----- src/mono/mono/mini/mini-runtime.c | 1 - src/mono/mono/mini/mini-s390x.c | 13 ------------- src/mono/mono/mini/mini-sparc.c | 5 ----- src/mono/mono/mini/mini-wasm.c | 6 ------ src/mono/mono/mini/mini-x86.c | 5 ----- src/mono/mono/mini/mini.h | 1 - 12 files changed, 61 deletions(-) diff --git a/src/mono/mono/mini/mini-amd64.c b/src/mono/mono/mini/mini-amd64.c index 15b6df7..8a8018e 100644 --- a/src/mono/mono/mini/mini-amd64.c +++ b/src/mono/mono/mini/mini-amd64.c @@ -8010,11 +8010,6 @@ mono_arch_finish_init (void) #endif } -void -mono_arch_free_jit_tls_data (MonoJitTlsData *tls) -{ -} - #define CMP_SIZE (6 + 1) #define CMP_REG_REG_SIZE (4 + 1) #define BR_SMALL_SIZE 2 diff --git a/src/mono/mono/mini/mini-arm.c b/src/mono/mono/mini/mini-arm.c index c37a655..f581655 100644 --- a/src/mono/mono/mini/mini-arm.c +++ b/src/mono/mono/mini/mini-arm.c @@ -6855,11 +6855,6 @@ mono_arch_finish_init (void) { } -void -mono_arch_free_jit_tls_data (MonoJitTlsData *tls) -{ -} - MonoInst* mono_arch_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, MonoInst **args) { diff --git a/src/mono/mono/mini/mini-arm64.c b/src/mono/mono/mini/mini-arm64.c index 766b1a5..c373dd9 100644 --- a/src/mono/mono/mini/mini-arm64.c +++ b/src/mono/mono/mini/mini-arm64.c @@ -1009,11 +1009,6 @@ mono_arch_patch_code_new (MonoCompile *cfg, MonoDomain *domain, guint8 *code, Mo } void -mono_arch_free_jit_tls_data (MonoJitTlsData *tls) -{ -} - -void mono_arch_flush_register_windows (void) { } diff --git a/src/mono/mono/mini/mini-mips.c b/src/mono/mono/mini/mini-mips.c index 5d0edd6..5f3d24e 100644 --- a/src/mono/mono/mini/mini-mips.c +++ b/src/mono/mono/mini/mini-mips.c @@ -5252,11 +5252,6 @@ mono_arch_finish_init (void) } void -mono_arch_free_jit_tls_data (MonoJitTlsData *tls) -{ -} - -void mono_arch_emit_this_vret_args (MonoCompile *cfg, MonoCallInst *inst, int this_reg, int this_type, int vt_reg) { int this_dreg = mips_a0; diff --git a/src/mono/mono/mini/mini-ppc.c b/src/mono/mono/mini/mini-ppc.c index 34e0bef..a2808c3 100644 --- a/src/mono/mono/mini/mini-ppc.c +++ b/src/mono/mono/mini/mini-ppc.c @@ -5474,11 +5474,6 @@ mono_arch_finish_init (void) { } -void -mono_arch_free_jit_tls_data (MonoJitTlsData *tls) -{ -} - #define CMP_SIZE (PPC_LOAD_SEQUENCE_LENGTH + 4) #define BR_SIZE 4 #define LOADSTORE_SIZE 4 diff --git a/src/mono/mono/mini/mini-riscv.c b/src/mono/mono/mini/mini-riscv.c index 4924aac..f43a213 100644 --- a/src/mono/mono/mini/mini-riscv.c +++ b/src/mono/mono/mini/mini-riscv.c @@ -46,11 +46,6 @@ mono_arch_register_lowlevel_calls (void) } void -mono_arch_free_jit_tls_data (MonoJitTlsData *tls) -{ -} - -void mono_arch_cleanup (void) { } diff --git a/src/mono/mono/mini/mini-runtime.c b/src/mono/mono/mini/mini-runtime.c index 75491f1..aa8abf1 100644 --- a/src/mono/mono/mini/mini-runtime.c +++ b/src/mono/mono/mini/mini-runtime.c @@ -944,7 +944,6 @@ free_jit_tls_data (MonoJitTlsData *jit_tls) //This happens during AOT cuz the thread is never attached if (!jit_tls) return; - mono_arch_free_jit_tls_data (jit_tls); mono_free_altstack (jit_tls); g_free (jit_tls->first_lmf); diff --git a/src/mono/mono/mini/mini-s390x.c b/src/mono/mono/mini/mini-s390x.c index 528e5a4..126f6d6 100644 --- a/src/mono/mono/mini/mini-s390x.c +++ b/src/mono/mono/mini/mini-s390x.c @@ -5923,19 +5923,6 @@ mono_arch_finish_init (void) /*========================= End of Function ========================*/ -/*------------------------------------------------------------------*/ -/* */ -/* Name - mono_arch_free_jit_tls_data */ -/* */ -/* Function - Free tls data. */ -/* */ -/*------------------------------------------------------------------*/ - -void -mono_arch_free_jit_tls_data (MonoJitTlsData *tls) -{ -} - /*========================= End of Function ========================*/ /*------------------------------------------------------------------*/ diff --git a/src/mono/mono/mini/mini-sparc.c b/src/mono/mono/mini/mini-sparc.c index 4456a46..fa33869 100644 --- a/src/mono/mono/mini/mini-sparc.c +++ b/src/mono/mono/mini/mini-sparc.c @@ -4347,11 +4347,6 @@ mono_arch_finish_init (void) { } -void -mono_arch_free_jit_tls_data (MonoJitTlsData *tls) -{ -} - MonoInst* mono_arch_emit_inst_for_method (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsig, MonoInst **args) { diff --git a/src/mono/mono/mini/mini-wasm.c b/src/mono/mono/mini/mini-wasm.c index 949ec2f..6840bec 100644 --- a/src/mono/mono/mini/mini-wasm.c +++ b/src/mono/mono/mini/mini-wasm.c @@ -441,12 +441,6 @@ mono_arch_flush_register_windows (void) { } -void -mono_arch_free_jit_tls_data (MonoJitTlsData *tls) -{ -} - - MonoMethod* mono_arch_find_imt_method (host_mgreg_t *regs, guint8 *code) { diff --git a/src/mono/mono/mini/mini-x86.c b/src/mono/mono/mini/mini-x86.c index 6b8d1c0..79e8583 100644 --- a/src/mono/mono/mini/mini-x86.c +++ b/src/mono/mono/mini/mini-x86.c @@ -5406,11 +5406,6 @@ mono_arch_finish_init (void) } } -void -mono_arch_free_jit_tls_data (MonoJitTlsData *tls) -{ -} - // Linear handler, the bsearch head compare is shorter //[2 + 4] x86_alu_reg_imm (code, X86_CMP, ins->sreg1, ins->inst_imm); //[1 + 1] x86_branch8(inst,cond,imm,is_signed) diff --git a/src/mono/mono/mini/mini.h b/src/mono/mono/mini/mini.h index c65d3bd..2ed98d4 100644 --- a/src/mono/mono/mini/mini.h +++ b/src/mono/mono/mini/mini.h @@ -2347,7 +2347,6 @@ void mono_arch_lowering_pass (MonoCompile *cfg, MonoBasicBloc void mono_arch_peephole_pass_1 (MonoCompile *cfg, MonoBasicBlock *bb); void mono_arch_peephole_pass_2 (MonoCompile *cfg, MonoBasicBlock *bb); void mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb); -void mono_arch_free_jit_tls_data (MonoJitTlsData *tls); void mono_arch_fill_argument_info (MonoCompile *cfg); void mono_arch_allocate_vars (MonoCompile *m); int mono_arch_get_argument_info (MonoMethodSignature *csig, int param_count, MonoJitArgumentInfo *arg_info); -- 2.7.4