Skip to content

More precise fix for #83792 #83856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 24, 2023
Merged

More precise fix for #83792 #83856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/mono/mono/mini/interp/transform.c
View file
Open in desktop
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