Skip to content

[mono] AOT-compile marshalling wrappers for layout classes with class-typed fields #129710

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
pavelsavara merged 4 commits into from
Jun 24, 2026
Merged

[mono] AOT-compile marshalling wrappers for layout classes with class-typed fields #129710

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
766c28d
[mono] AOT-compile marshalling wrappers for layout classes with class…
pavelsavara Jun 22, 2026
3b8fb68
Guard can_marshal_struct against recursion on cyclic layout types
pavelsavara Jun 22, 2026
d04dc87
Merge remote-tracking branch 'upstream/main' into mono-aot-marshal-la…
pavelsavara Jun 23, 2026
609a3c0
[mono] Fix 'marshallable' typo in can_marshal_struct comment
pavelsavara Jun 23, 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
10 changes: 10 additions & 0 deletions src/mono/mono/mini/aot-compiler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4584,6 +4584,16 @@ can_marshal_struct (MonoClass *klass)
if (!m_class_is_enumtype (mono_class_from_mono_type_internal (field->type)) && !can_marshal_struct (mono_class_from_mono_type_internal (field->type)))
can_marshal = FALSE;
break;
case MONO_TYPE_CLASS:
/*
* A field whose type is a non-auto-layout (sequential/explicit) class is marshalled
* as an embedded struct, the same way the runtime marshalling code handles it. Allow it
* if the nested class is itself marshallable; otherwise the StructureToPtr/PtrToStructure
Comment thread
pavelsavara marked this conversation as resolved.
Outdated
Comment thread
pavelsavara marked this conversation as resolved.
Outdated
* wrappers are not AOT compiled and full-AOT fails with a JIT-in-aot-only error.
*/
if (!can_marshal_struct (mono_class_from_mono_type_internal (field->type)))
can_marshal = FALSE;
Comment thread
pavelsavara marked this conversation as resolved.
Outdated
break;
case MONO_TYPE_SZARRAY: {
gboolean has_mspec = FALSE;

Expand Down
1 change: 0 additions & 1 deletion src/tests/JIT/Regression/JitBlue/WPF_3226/CSharpRepro/WPF_3226.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ static void WmGetMinMaxInfo(IntPtr lParam)
Marshal.StructureToPtr(mmi, lParam, true);
}

[ActiveIssue("https://github.com/dotnet/runtime/issues/129508", TestRuntimes.Mono)]
[Fact]
public unsafe static int TestEntryPoint()
{
Expand Down
Loading