[jit] Fix a regression caused by 28374f3161d7bd2521b26b4ce23515ec27eb2174. Fixes...

diff --git a/mono/mini/mini-trampolines.c b/mono/mini/mini-trampolines.c
index feefcb69b6455a145213566fa89c3c4e522eb1dc..80f5dc3bdee113eb059a19f41e64d74f4c52af69 100644 (file)
--- a/mono/mini/mini-trampolines.c
+++ b/mono/mini/mini-trampolines.c
@@ -356,7 +356,8 @@ mini_add_method_trampoline (MonoMethod *orig_method, MonoMethod *m, gpointer com
 
        if (callee_array_helper) {
                add_static_rgctx_tramp = FALSE;
-               if (ji && ji->from_aot) {
+               /* FIXME: ji->from_aot is not set for llvm methods */
+               if (ji && (ji->from_aot || mono_aot_only)) {
                        /* In AOT mode, compiled_method points to one of the InternalArray methods in Array. */
                        if (mono_method_needs_static_rgctx_invoke (jinfo_get_method (ji), TRUE))
                                add_static_rgctx_tramp = TRUE;