Skip to content

Commit ca863b7

Browse files
committed
Remove now unused MONO_PATCH_INFO_METHOD_CODE_SLOT.
1 parent e16e7ae commit ca863b7

File tree

5 files changed

+0
-23
lines changed

5 files changed

+0
-23
lines changed

src/mono/mono/mini/aot-compiler.c

-2
Original file line numberDiff line numberDiff line change
@@ -6967,7 +6967,6 @@ encode_patch (MonoAotCompile *acfg, MonoJumpInfo *patch_info, guint8 *buf, guint
69676967
case MONO_PATCH_INFO_ICALL_ADDR:
69686968
case MONO_PATCH_INFO_ICALL_ADDR_CALL:
69696969
case MONO_PATCH_INFO_METHOD_RGCTX:
6970-
case MONO_PATCH_INFO_METHOD_CODE_SLOT:
69716970
case MONO_PATCH_INFO_METHOD_PINVOKE_ADDR_CACHE:
69726971
encode_method_ref (acfg, patch_info->data.method, p, &p);
69736972
break;
@@ -8936,7 +8935,6 @@ can_encode_patch (MonoAotCompile *acfg, MonoJumpInfo *patch_info)
89368935
case MONO_PATCH_INFO_METHOD:
89378936
case MONO_PATCH_INFO_METHOD_FTNDESC:
89388937
case MONO_PATCH_INFO_METHODCONST:
8939-
case MONO_PATCH_INFO_METHOD_CODE_SLOT:
89408938
case MONO_PATCH_INFO_METHOD_PINVOKE_ADDR_CACHE:
89418939
case MONO_PATCH_INFO_LLVMONLY_INTERP_ENTRY: {
89428940
MonoMethod *method = patch_info->data.method;

src/mono/mono/mini/aot-runtime.c

-1
Original file line numberDiff line numberDiff line change
@@ -3778,7 +3778,6 @@ decode_patch (MonoAotModule *aot_module, MonoMemPool *mp, MonoJumpInfo *ji, guin
37783778
case MONO_PATCH_INFO_ICALL_ADDR:
37793779
case MONO_PATCH_INFO_ICALL_ADDR_CALL:
37803780
case MONO_PATCH_INFO_METHOD_RGCTX:
3781-
case MONO_PATCH_INFO_METHOD_CODE_SLOT:
37823781
case MONO_PATCH_INFO_METHOD_PINVOKE_ADDR_CACHE:
37833782
case MONO_PATCH_INFO_LLVMONLY_INTERP_ENTRY: {
37843783
MethodRef ref;

src/mono/mono/mini/mini-runtime.c

-18
Original file line numberDiff line numberDiff line change
@@ -1235,7 +1235,6 @@ mono_patch_info_hash (gconstpointer data)
12351235
case MONO_PATCH_INFO_SEQ_POINT_INFO:
12361236
case MONO_PATCH_INFO_METHOD_RGCTX:
12371237
case MONO_PATCH_INFO_SIGNATURE:
1238-
case MONO_PATCH_INFO_METHOD_CODE_SLOT:
12391238
case MONO_PATCH_INFO_AOT_JIT_INFO:
12401239
case MONO_PATCH_INFO_METHOD_PINVOKE_ADDR_CACHE:
12411240
case MONO_PATCH_INFO_GSHARED_METHOD_INFO:
@@ -1493,22 +1492,6 @@ mono_resolve_patch_target_ext (MonoMemoryManager *mem_manager, MonoMethod *metho
14931492
mono_error_assert_ok (error);
14941493
break;
14951494
}
1496-
case MONO_PATCH_INFO_METHOD_CODE_SLOT: {
1497-
gpointer code_slot;
1498-
1499-
MonoJitMemoryManager *jit_mm = jit_mm_for_method (patch_info->data.method);
1500-
jit_mm_lock (jit_mm);
1501-
if (!jit_mm->method_code_hash)
1502-
jit_mm->method_code_hash = g_hash_table_new (NULL, NULL);
1503-
code_slot = g_hash_table_lookup (jit_mm->method_code_hash, patch_info->data.method);
1504-
if (!code_slot) {
1505-
code_slot = mono_mem_manager_alloc0 (jit_mm->mem_manager, sizeof (gpointer));
1506-
g_hash_table_insert (jit_mm->method_code_hash, patch_info->data.method, code_slot);
1507-
}
1508-
jit_mm_unlock (jit_mm);
1509-
target = code_slot;
1510-
break;
1511-
}
15121495
case MONO_PATCH_INFO_METHOD_PINVOKE_ADDR_CACHE: {
15131496
target = mono_mem_manager_alloc0 (mem_manager, sizeof (gpointer));
15141497
break;
@@ -4302,7 +4285,6 @@ free_jit_mem_manager (MonoMemoryManager *mem_manager)
43024285
g_hash_table_foreach (info->dynamic_code_hash, dynamic_method_info_free, NULL);
43034286
g_hash_table_destroy (info->dynamic_code_hash);
43044287
}
4305-
g_hash_table_destroy (info->method_code_hash);
43064288
g_hash_table_destroy (info->jump_trampoline_hash);
43074289
g_hash_table_destroy (info->jit_trampoline_hash);
43084290
g_hash_table_destroy (info->delegate_info_hash);

src/mono/mono/mini/mini-runtime.h

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ typedef struct {
3232
GHashTable *static_rgctx_trampoline_hash;
3333
/* maps MonoMethod -> MonoJitDynamicMethodInfo */
3434
GHashTable *dynamic_code_hash;
35-
GHashTable *method_code_hash;
3635
/* Maps methods to a RuntimeInvokeInfo structure, protected by the associated MonoDomain lock */
3736
MonoConcurrentHashTable *runtime_invoke_hash;
3837
/* Maps MonoMethod to a GPtrArray containing sequence point locations */

src/mono/mono/mini/patch-info.h

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ PATCH_INFO(SIGNATURE, "signature")
4444
PATCH_INFO(GSHAREDVT_CALL, "gsharedvt_call")
4545
PATCH_INFO(GSHAREDVT_METHOD, "gsharedvt_method")
4646
PATCH_INFO(OBJC_SELECTOR_REF, "objc_selector_ref")
47-
PATCH_INFO(METHOD_CODE_SLOT, "method_code_slot")
4847
PATCH_INFO(LDSTR_LIT, "ldstr_lit")
4948
PATCH_INFO(GC_NURSERY_START, "gc_nursery_start")
5049
PATCH_INFO(VIRT_METHOD, "virt_method")

0 commit comments

Comments
 (0)