Skip to content

Commit

Permalink
Revert "[mono][aot] Deduplicate runtime invoke wrappers on iOS (#85908)…
Browse files Browse the repository at this point in the history
…" (#87066)

We have encountered more frequent failures following the merge as outlined in #85908 (comment), so we will revert the change and try to reproduce the issue locally using the same version of macOS and iPhone as on the CI environment.

Reverts #85908
  • Loading branch information
kotlarmilos authored Jun 2, 2023
1 parent 7e47c13 commit ffa12cc
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/mono/mono/mini/aot-compiler.c
Original file line number Diff line number Diff line change
Expand Up @@ -4334,9 +4334,6 @@ collect_dedup_method (MonoAotCompile *acfg, MonoMethod *method)
static int
add_method_full (MonoAotCompile *acfg, MonoMethod *method, gboolean extra, int depth)
{
if (collect_dedup_method (acfg, method))
return -1;

int index;

index = GPOINTER_TO_UINT (g_hash_table_lookup (acfg->method_indexes, method));
Expand Down Expand Up @@ -4423,6 +4420,9 @@ add_extra_method_full (MonoAotCompile *acfg, MonoMethod *method, gboolean prefer
mono_error_assert_ok (error);
}

if (collect_dedup_method (acfg, method))
return;

if (acfg->aot_opts.log_generics)
aot_printf (acfg, "%*sAdding method %s.\n", depth, "", mono_method_get_full_name (method));

Expand Down
5 changes: 5 additions & 0 deletions src/mono/mono/mini/aot-runtime.c
Original file line number Diff line number Diff line change
Expand Up @@ -4556,7 +4556,12 @@ mono_aot_can_dedup (MonoMethod *method)
/* Use a set of wrappers/instances which work and useful */
switch (method->wrapper_type) {
case MONO_WRAPPER_RUNTIME_INVOKE:
#ifdef TARGET_WASM
return TRUE;
#else
return FALSE;
#endif
break;
case MONO_WRAPPER_OTHER: {
WrapperInfo *info = mono_marshal_get_wrapper_info (method);

Expand Down

0 comments on commit ffa12cc

Please sign in to comment.