Remove an unused argument from mini_add_method_trampoline ().

diff --git a/mono/mini/mini-generic-sharing.c b/mono/mini/mini-generic-sharing.c
index 36e85d9b5ed62e348871083f8d28fc7eacd28b5b..36b9f52cfd4d35f6aeda74b6b630c3e578be2b23 100644 (file)
--- a/mono/mini/mini-generic-sharing.c
+++ b/mono/mini/mini-generic-sharing.c
@@ -1100,7 +1100,7 @@ instantiate_info (MonoDomain *domain, MonoRuntimeGenericContextInfoTemplate *oti
                gpointer addr;
 
                addr = mono_compile_method (data);
-               return mini_add_method_trampoline (NULL, data, addr, NULL, mono_method_needs_static_rgctx_invoke (data, FALSE));
+               return mini_add_method_trampoline (NULL, data, addr, mono_method_needs_static_rgctx_invoke (data, FALSE));
        }
        case MONO_RGCTX_INFO_REMOTING_INVOKE_WITH_CHECK:
                return mono_compile_method (mono_marshal_get_remoting_invoke_with_check (data));

diff --git a/mono/mini/mini-trampolines.c b/mono/mini/mini-trampolines.c
index 50bd275b067533750c396ec319da9d3430fe2d20..613f6d4f7335f932d95306804b3672109d00e3d3 100644 (file)
--- a/mono/mini/mini-trampolines.c
+++ b/mono/mini/mini-trampolines.c
@@ -302,7 +302,7 @@ ji_is_gsharedvt (MonoJitInfo *ji)
  * ORIG_METHOD is the method the caller originally called i.e. an iface method, or NULL.
  */
 gpointer
-mini_add_method_trampoline (MonoMethod *orig_method, MonoMethod *m, gpointer compiled_method, MonoJitInfo *caller_ji, gboolean add_static_rgctx_tramp)
+mini_add_method_trampoline (MonoMethod *orig_method, MonoMethod *m, gpointer compiled_method, gboolean add_static_rgctx_tramp)
 {
        gpointer addr = compiled_method;
        gboolean callee_gsharedvt, callee_array_helper;
@@ -573,10 +573,7 @@ common_call_trampoline (mgreg_t *regs, guint8 *code, MonoMethod *m, guint8* tram
 
        mono_debugger_trampoline_compiled (code, m, addr);
 
-       // FIXME: Is this needed ?
-       if (!ji)
-               ji = mini_jit_info_table_find (mono_domain_get (), (char*)code, NULL);
-       addr = mini_add_method_trampoline (orig_method, m, compiled_method, ji, need_rgctx_tramp);
+       addr = mini_add_method_trampoline (orig_method, m, compiled_method, need_rgctx_tramp);
 
        if (generic_virtual || variant_iface) {
                MonoMethod *target = generic_virtual ? generic_virtual : variant_iface;
@@ -1059,7 +1056,7 @@ mono_delegate_trampoline (mgreg_t *regs, guint8 *code, gpointer *tramp_data, gui
                                // FIXME: GSHAREDVT
                                addr = get_unbox_trampoline (method, addr, need_rgctx_tramp);
                        else
-                               addr = mini_add_method_trampoline (NULL, method, compiled_method, NULL, need_rgctx_tramp);
+                               addr = mini_add_method_trampoline (NULL, method, compiled_method, need_rgctx_tramp);
                        delegate->method_ptr = addr;
                        if (enable_caching && delegate->method_code)
                                *delegate->method_code = delegate->method_ptr;
@@ -1087,7 +1084,7 @@ mono_delegate_trampoline (mgreg_t *regs, guint8 *code, gpointer *tramp_data, gui
        /* The general, unoptimized case */
        m = mono_marshal_get_delegate_invoke (invoke, delegate);
        code = mono_compile_method (m);
-       code = mini_add_method_trampoline (NULL, m, code, NULL, mono_method_needs_static_rgctx_invoke (m, FALSE));
+       code = mini_add_method_trampoline (NULL, m, code, mono_method_needs_static_rgctx_invoke (m, FALSE));
        delegate->invoke_impl = mono_get_addr_from_ftnptr (code);
        mono_debugger_trampoline_compiled (NULL, m, delegate->invoke_impl);
 

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index 12752a03389d61b5268366df85708b9183c61acd..ef41cc263ab83135feaf59fd428565df997fe8dc 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -6098,7 +6098,7 @@ mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObjec
                                }
                        }
 
-                       info->compiled_method = mini_add_method_trampoline (NULL, method, info->compiled_method, NULL, mono_method_needs_static_rgctx_invoke (method, FALSE));
+                       info->compiled_method = mini_add_method_trampoline (NULL, method, info->compiled_method, mono_method_needs_static_rgctx_invoke (method, FALSE));
                }
 
                /*

diff --git a/mono/mini/mini.h b/mono/mini/mini.h
index 32cb1ae3c89f2e56610df7a43bc2b9ecdac5e938..ed400d96a6633f2a188ea6f70f317bc7384416d0 100644 (file)
--- a/mono/mini/mini.h
+++ b/mono/mini/mini.h
@@ -2062,7 +2062,7 @@ gconstpointer     mono_get_trampoline_func (MonoTrampolineType tramp_type);
 gpointer          mini_get_vtable_trampoline (int slot_index) MONO_INTERNAL;
 char*             mono_get_generic_trampoline_name (MonoTrampolineType tramp_type) MONO_INTERNAL;
 char*             mono_get_rgctx_fetch_trampoline_name (int slot) MONO_INTERNAL;
-gpointer          mini_add_method_trampoline (MonoMethod *orig_method, MonoMethod *m, gpointer compiled_method, MonoJitInfo *caller_ji, gboolean add_static_rgctx_tramp) MONO_INTERNAL;
+gpointer          mini_add_method_trampoline (MonoMethod *orig_method, MonoMethod *m, gpointer compiled_method, gboolean add_static_rgctx_tramp) MONO_INTERNAL;
 
 gboolean          mono_running_on_valgrind (void) MONO_INTERNAL;
 void*             mono_global_codeman_reserve (int size) MONO_INTERNAL;