[mono][wasm] Fix support for virtual invokes. (#86709)

Fixes #86621. Co-authored-by: Zoltan Varga <vargaz@gmail.com>
dotnet · May 25, 2023 · 61d367b · 61d367b
1 parent c6e1d37
commit 61d367b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/mono/mono/mini/method-to-ir.c b/src/mono/mono/mini/method-to-ir.c
@@ -7528,7 +7528,10 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
 					goto calli_end;
 				}
 			}
-			if (cfg->llvm_only && !(cfg->method->wrapper_type && cfg->method->wrapper_type != MONO_WRAPPER_DYNAMIC_METHOD))
+			/* Some wrappers use calli with ftndesc-es */
+			if (cfg->llvm_only && !(cfg->method->wrapper_type &&
+									cfg->method->wrapper_type != MONO_WRAPPER_DYNAMIC_METHOD &&
+									cfg->method->wrapper_type != MONO_WRAPPER_DELEGATE_INVOKE))
 				ins = mini_emit_llvmonly_calli (cfg, fsig, sp, addr);
 			else
 				ins = (MonoInst*)mini_emit_calli_full (cfg, fsig, sp, addr, NULL, NULL, tailcall);

diff --git a/src/mono/mono/mini/mini-runtime.c b/src/mono/mono/mini/mini-runtime.c
@@ -2920,7 +2920,7 @@ get_ftnptr_for_method (MonoMethod *method, gboolean need_unbox, MonoError *error
 		res = mini_add_method_trampoline (method, res, mono_method_needs_static_rgctx_invoke (method, TRUE), need_unbox);
 		return res;
 	} else {
-		return mini_llvmonly_load_method_ftndesc (method, FALSE, FALSE, error);
+		return mini_llvmonly_load_method_ftndesc (method, FALSE, need_unbox, error);
 	}
 }