File tree Expand file tree Collapse file tree 1 file changed +5
-2
lines changed Expand file tree Collapse file tree 1 file changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -57,10 +57,13 @@ mono_ldftn (MonoMethod *method)
57
57
58
58
/* if we need the address of a native-to-managed wrapper, just compile it now, trampoline needs thread local
59
59
* variables that won't be there if we run on a thread that's not attached yet. */
60
- if (method -> wrapper_type == MONO_WRAPPER_NATIVE_TO_MANAGED )
60
+ if (method -> wrapper_type == MONO_WRAPPER_NATIVE_TO_MANAGED ) {
61
61
addr = mono_compile_method_checked (method , error );
62
- else
62
+ } else {
63
63
addr = mono_create_jump_trampoline (method , FALSE, error );
64
+ if (mono_method_needs_static_rgctx_invoke (method , FALSE))
65
+ addr = mono_create_static_rgctx_trampoline (method , addr );
66
+ }
64
67
if (!is_ok (error )) {
65
68
mono_error_set_pending_exception (error );
66
69
return NULL ;
You can’t perform that action at this time.
0 commit comments