Skip to content

Commit

Permalink
More precise fix for dotnet#83792
Browse files Browse the repository at this point in the history
  • Loading branch information
kg committed Mar 23, 2023
1 parent 2419c20 commit 8ed23ae
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/mono/mono/mini/interp/transform.c
Original file line number Diff line number Diff line change
Expand Up @@ -2875,10 +2875,6 @@ interp_method_check_inlining (TransformData *td, MonoMethod *method, MonoMethodS
if (g_list_find (td->dont_inline, method))
return FALSE;

// temp workaround for https://github.com/dotnet/runtime/issues/83792 -kg
if (mono_interp_jit_call_supported(method, csignature))
return FALSE;

return TRUE;
}

Expand Down Expand Up @@ -3485,6 +3481,9 @@ interp_transform_call (TransformData *td, MonoMethod *method, MonoMethod *target
if (td->verbose_level > 1)
g_print("Disabling inlining because we have no target_method for call in %s\n", td->method->name);
return FALSE;
} else if (td->method->wrapper_type == MONO_WRAPPER_RUNTIME_INVOKE) {
// This scenario causes https://github.com/dotnet/runtime/issues/83792
return FALSE;
} else if (has_doesnotreturn_attribute(target_method)) {
/*
* Since the method does not return, it's probably a throw helper and will not be called.
Expand Down

0 comments on commit 8ed23ae

Please sign in to comment.