Skip to content

[Mono] Fix support for nested structs with explicit layout - #61467

Merged
simonrozsival merged 28 commits into
dotnet:mainfrom
simonrozsival:simonrozsival/61385-nested-struct-with-explicit-layout
Dec 2, 2021
Merged

[Mono] Fix support for nested structs with explicit layout#61467
simonrozsival merged 28 commits into
dotnet:mainfrom
simonrozsival:simonrozsival/61385-nested-struct-with-explicit-layout

Conversation

@simonrozsival

@simonrozsivalsimonrozsival commented Nov 11, 2021•
edited
Loading

Copy link
Copy Markdown
Member

The current implementation of explicit struct layout check doesn't consider the layout of embedded value types. This new implementation recursively checks the inner structure of all embedded structs.

Fixes#61385

@ghostghost added the area-VM-meta-mono label Nov 11, 2021
@ghost

ghost commented Nov 11, 2021

Copy link
Copy Markdown

Tagging subscribers to this area:
See info in area-owners.md if you want to be subscribed.

Issue Details

WIP

Fixes #61385

Author:simonrozsival
Assignees:-
Labels:

area-VM-meta-mono

Milestone:-

@simonrozsival
Add license
4574ac3
@simonrozsival
Modify test
7d49b82
@simonrozsival
Temporarily enable the test in the CI pipeline
e18281d
@simonrozsival
Allow running Mac Catalyst builds in App Sandbox
1e40416
@simonrozsival
Allow enabling app sandbox for the other Mac Catalyst sample
8c3c9f9
@simonrozsival
Revert "Allow enabling app sandbox for the other Mac Catalyst sample"
586f4e4
This reverts commit 8c3c9f9.
@simonrozsival
Revert "Allow running Mac Catalyst builds in App Sandbox"
49af5fd
This reverts commit 1e40416.
@simonrozsival
Add more test cases
fd663ef
@simonrozsival
WIP: First implementation of the recursive check
993bf36
@simonrozsival
Merge branch 'main' of github.com:simonrozsival/runtime into simonroz…
5814633
…sival/61385-nested-struct-with-explicit-layout
@simonrozsival
Improve code
7d072ff
@simonrozsival
Fix test case
0cd67e2
@simonrozsival
Add more test cases
017258f
@simonrozsival
Unify test cases
cd7cb1d
@simonrozsival
Bugfixes
1b1dfed
@simonrozsival
Remove test which behaves differently depending on the target platform
342d6cd
@simonrozsival
Remove sequential layout test which behaves differently on Linux and …
bb00b01
…on Windows
@simonrozsival
Reorganize test cases
afa00a7
@simonrozsival
Remove call to mono_class_setup_fields
da553d7
@simonrozsival
Fix embedding detection
699fa7d
@simonrozsival
Fix layout validation for generic structs
8803138
@simonrozsival
Remove unintentional change
a53285b
@simonrozsival
Revert temporary change to the runtime.yml pipeline
c5e92db
@simonrozsival
simonrozsival marked this pull request as ready for review November 25, 2021 07:40
@runfoapprunfoappBot mentioned this pull request Nov 25, 2021
Closed
lambdageek
lambdageek approved these changes Dec 1, 2021
View reviewed changes

@lambdageeklambdageek left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks, Simon!

I suggested to use the m_class_XYZ getters for accessing MonoClass fields in a couple of places. Technically class-init.c is allowed to use the fields directly, it's probably a good idea to only do it when you're also initializing the MonoClass.

Comment threadsrc/mono/mono/metadata/class-init.c Outdated
Comment threadsrc/mono/mono/metadata/class-init.c Outdated
Comment threadsrc/mono/mono/metadata/class-init.c Outdated
thaystg
thaystg reviewed Dec 1, 2021
View reviewed changes
Comment threadeng/pipelines/runtime.yml
@simonrozsival

simonrozsival commented Dec 1, 2021

Copy link
Copy Markdown
MemberAuthor

Thanks for the feedback @lambdageek! I replaced the direct accesses with those getters as you suggested.

@simonrozsival
simonrozsival merged commit 64d1276 into dotnet:mainDec 2, 2021
@simonrozsival
simonrozsival deleted the simonrozsival/61385-nested-struct-with-explicit-layout branch December 2, 2021 13:08
@radicalradical mentioned this pull request Dec 2, 2021
Closed
@lambdageeklambdageek mentioned this pull request Dec 3, 2021
Closed
agocke added a commit to agocke/runtime that referenced this pull request Dec 3, 2021
@agocke
Revert "[Mono] Fix support for nested structs with explicit layout (d…
dbd1955
…otnet#61467)"
This reverts commit 64d1276.
@lambdageeklambdageek mentioned this pull request Dec 3, 2021
Open
@lambdageeklambdageek mentioned this pull request Dec 13, 2021
Open
lambdageek added a commit to lambdageek/runtime that referenced this pull request Dec 13, 2021
@lambdageek
[tests] Re-enable some explicit layout tests on Mono
9863597
These were fixed by dotnet#61467
Related to dotnet#36112
@lambdageeklambdageek mentioned this pull request Dec 13, 2021
Merged
lambdageek added a commit that referenced this pull request Dec 14, 2021
@lambdageek
[tests] Re-enable some explicit layout tests on Mono (#62746)
6712f18
* [tests] Re-enable some explicit layout tests on Mono
These were fixed by #61467
Related to #36112
* objref and non-objref overlap tests expected to fail AOT compilation
As well as the NestedStructs tests.
Resolves#62567
@ghostghost locked as resolved and limited conversation to collaborators Jan 1, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@thaystgthaystgthaystg left review comments
@lambdageeklambdageeklambdageek approved these changes
@vargazvargazAwaiting requested review from vargaz

Assignees

No one assigned

Labels

area-VM-meta-mono

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[mono] class initializaiton overlap check does not support nested structs with explicit layout

3 participants

@simonrozsival@lambdageek@thaystg