[jit] Using a literal field with stdsfld/ldsfld should trigger a MissingFieldExceptio...

[mono.git] / mono / mini / tramp-arm.c

diff --git a/mono/mini/tramp-arm.c b/mono/mini/tramp-arm.c
index 311a30c0f935b7f6e10efc6654dd32940bd78013..2430e2295ceda8979dab5340ee18e038b737c70b 100644 (file)
--- a/mono/mini/tramp-arm.c
+++ b/mono/mini/tramp-arm.c
@@ -23,6 +23,7 @@
 #include "mini.h"
 #include "mini-arm.h"
 #include "debugger-agent.h"
+#include "jit-icalls.h"
 
 #define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
 
@@ -379,7 +380,7 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf
         * Have to call the _force_ variant, since there could be a protected wrapper on the top of the stack.
         */
        if (aot) {
-               ji = mono_patch_info_list_prepend (ji, code - buf, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_thread_force_interruption_checkpoint");
+               ji = mono_patch_info_list_prepend (ji, code - buf, MONO_PATCH_INFO_JIT_ICALL_ADDR, "mono_interruption_checkpoint_from_trampoline");
                ARM_LDR_IMM (code, ARMREG_IP, ARMREG_PC, 0);
                ARM_B (code, 0);
                *(gpointer*)code = NULL;
@@ -389,11 +390,11 @@ mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInf
 #ifdef USE_JUMP_TABLES
                gpointer *jte = mono_jumptable_add_entry ();
                code = mono_arm_load_jumptable_entry (code, jte, ARMREG_IP);
-               jte [0] = mono_thread_force_interruption_checkpoint;
+               jte [0] = mono_interruption_checkpoint_from_trampoline;
 #else
                ARM_LDR_IMM (code, ARMREG_IP, ARMREG_PC, 0);
                ARM_B (code, 0);
-               *(gpointer*)code = mono_thread_force_interruption_checkpoint;
+               *(gpointer*)code = mono_interruption_checkpoint_from_trampoline;
                code += 4;
 #endif
        }