Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Holmes <bill.holmes@unity3d.com>2021-10-19 11:57:35 +0300
committerGitHub <noreply@github.com>2021-10-19 11:57:35 +0300
commitf747d09986808988a18d13903bdb11bae8610f43 (patch)
tree0c1b18950ef05cabd95bbfca719a7d1cf668268d
parent8266c5604b8c03882f2b06af27fdea46b142d6b9 (diff)
Fix crash in common_call_trampoline due to inconsistent rgctx mode (#21250)
-rw-r--r--mono/mini/mini-trampolines.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mono/mini/mini-trampolines.c b/mono/mini/mini-trampolines.c
index 6d9f8777e93..3de8213ef02 100644
--- a/mono/mini/mini-trampolines.c
+++ b/mono/mini/mini-trampolines.c
@@ -564,7 +564,7 @@ common_call_trampoline (host_mgreg_t *regs, guint8 *code, MonoMethod *m, MonoVTa
/*
* The caller is gshared code, compute the actual method to call from M and this/rgctx.
*/
- if (m->is_inflated && mono_method_get_context (m)->method_inst) {
+ if (m->is_inflated && (mono_method_get_context (m)->method_inst || mini_method_is_default_method (m))) {
MonoMethodRuntimeGenericContext *mrgctx = (MonoMethodRuntimeGenericContext*)mono_arch_find_static_call_vtable (regs, code);
klass = mrgctx->class_vtable->klass;