Skip to content

Remove dependency of type system tests on ILCompiler.ReadyToRun#63323

Merged
MichalStrehovsky merged 2 commits intodotnet:mainfrom
MichalStrehovsky:fixtstest
Jan 5, 2022
Merged

Remove dependency of type system tests on ILCompiler.ReadyToRun#63323
MichalStrehovsky merged 2 commits intodotnet:mainfrom
MichalStrehovsky:fixtstest

Conversation

@MichalStrehovsky
Copy link
Member

This is now shared unit test project that is not AOT/JIT specific.

The recently added MarshalUtilsTests.cs created a dependency on these.

This is now shared unit test project that is not AOT/JIT specific.

The recently added MarshalUtilsTests.cs created a dependency on these.
<Platforms>AnyCPU;x64</Platforms>
<PlatformTarget>AnyCPU</PlatformTarget>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DefineConstants>READYTORUN;$(DefineConstants)</DefineConstants>
Copy link
Member

Choose a reason for hiding this comment

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

We should not have any PInvoke stubs that do any actual marshaling in CoreLib anymore. It should be possible to clean up these ifdefs by stripping the bit of marshaling generation from crossgen2 that it still has (ie only generate stubs that do not require any actual marshaling in crossgen2).

It does not have to be done in this PR, but it may be nice to add comment.

Copy link
Member Author

Choose a reason for hiding this comment

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

I've added READYTORUN as a shortcut because without it I would need to include InteropStateManager.cs and that depends on a bunch of more files. It was convenient.

#if !READYTORUN
InteropStateManager interopStateManager,
#endif

I'll put it in a comment.

@MichalStrehovsky MichalStrehovsky merged commit 586918a into dotnet:main Jan 5, 2022
@MichalStrehovsky MichalStrehovsky deleted the fixtstest branch January 5, 2022 06:15
@ghost ghost locked as resolved and limited conversation to collaborators Feb 4, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants