Skip to content

Narrow Mono AOT typeload error cleanup #129748

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
vitek-karas merged 2 commits into from
Jun 24, 2026
+58 −3
Merged

Narrow Mono AOT typeload error cleanup #129748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cc935b
Narrow Mono AOT typeload error cleanup
vitek-karas Jun 22, 2026
cd143fe
Add Mono mini typeload regression
vitek-karas Jun 22, 2026
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
50 changes: 50 additions & 0 deletions src/mono/mono/mini/iltests.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3224,6 +3224,56 @@ L_3:
IL_000c: ret
}

.class nested private auto ansi beforefieldinit MissingFieldCarrier`1<T>
extends [mscorlib]System.Object
{
.method public hidebysig specialname rtspecialname instance default void .ctor () cil managed
{
.maxstack 8
ldarg.0
call instance void object::.ctor()
ret
}
}

// After lowering the missing-field access into a runtime throw, AOT must also
// consume the recoverable metadata error so the later accepted inline does not
// trip inline_method()'s cfg->error assert.
.method private hidebysig static void missing_field_then_inline<T> () cil managed
{
.maxstack 8
ldnull
ldfld !0 class Tests/MissingFieldCarrier`1<!!0>::missing
pop
ldc.i4.2
call int32 Tests::always_inline(int32)
pop
ret
}

.method public hidebysig static int32 test_0_missing_field_then_inline () cil managed
{
.maxstack 8
.locals init (int32 V_0)
.try
{
call void class Tests::missing_field_then_inline<string> ()
ldc.i4.1
stloc.0
leave.s IL_0011
}
catch [mscorlib]System.MissingFieldException
{
pop
ldc.i4.0
stloc.0
leave.s IL_0011
}

IL_0011: ldloc.0
ret
}

.method public hidebysig static int32 test_104_conv_u_and_string() cil managed
{
.maxstack 8
Expand Down
11 changes: 8 additions & 3 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 @@ -10167,9 +10167,14 @@ mono_method_to_ir (MonoCompile *cfg, MonoMethod *method, MonoBasicBlock *start_b
if (!field || CLASS_HAS_FAILURE (klass)) {
HANDLE_TYPELOAD_ERROR (cfg, klass);

// Reached only in AOT. Cannot turn a token into a class. We silence the compilation error
// and generate a runtime exception.
if (cfg->error->error_code == MONO_ERROR_BAD_IMAGE)
/*
* Reached only in AOT. After lowering the field resolution failure into a runtime
* throw, consume the expected recoverable metadata errors as well. Memberref field
* resolution can report MissingField/BadImage directly through cfg->error without
* setting cfg->exception_type, and leaving one of those live lets an accepted inline
* trip the inline_method () cfg->error assert later on.
*/
if (cfg->error->error_code == MONO_ERROR_BAD_IMAGE || cfg->error->error_code == MONO_ERROR_MISSING_FIELD)
clear_cfg_error (cfg);

// We need to push a dummy value onto the stack, respecting the intended type.
Expand Down
Loading