Skip to content
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

[release/9.0-staging] [mono][mini] Disable inlining if we encounter class initialization failure #112005

Merged
merged 2 commits into from
Feb 21, 2025
Merged

[release/9.0-staging] [mono][mini] Disable inlining if we encounter class initialization failure #112005

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b820b58
[mono][mini] Disable inlining if we encounter class initialization fa…
BrzVlad Jan 23, 2025
d6a7a21
Merge branch 'release/9.0-staging' into backport/pr-111754-to-release…
steveisok Feb 20, 2025
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
2 changes: 2 additions & 0 deletions src/mono/mono/mini/method-to-ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10143,6 +10143,8 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
EMIT_NEW_PCONST (cfg, *sp, NULL);
sp++;
} else if (il_op == MONO_CEE_LDFLD || il_op == MONO_CEE_LDSFLD) {
// method_make_alwaysthrow_typeloadfailure currently doesn't work with inlining
INLINE_FAILURE("type load error");
// An object is expected here. It may be impossible to correctly infer its type,
// we turn this entire method into a throw.
method_make_alwaysthrow_typeloadfailure (cfg, klass);
Expand Down
Loading