Skip to content

Check for generic structs in "needs marshalling" check #90836

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
merged 11 commits into from
Sep 1, 2023
Merged

Check for generic structs in "needs marshalling" check #90836

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9a735fd
Check for generic structs in blittability tests
jtschuster Aug 18, 2023
7584e6e
Remove Unused and commented code
jtschuster Aug 18, 2023
6825ffe
Add test in ilproj
jtschuster Aug 21, 2023
26d49b4
Use correct expected exception
jtschuster Aug 23, 2023
9e2e439
update test
jtschuster Aug 24, 2023
b3253ea
Apply suggestions from code review
jtschuster Aug 25, 2023
18f77b7
wip
jtschuster Aug 29, 2023
5216eb6
Merge branch 'CheckGenericStructBlittable' of https://github.com/jtsc…
jtschuster Aug 29, 2023
8e66f37
Update src/coreclr/vm/dllimport.cpp
jtschuster Aug 30, 2023
0371807
Fix typo
jtschuster Aug 30, 2023
9e3564b
Don't redefine default param
jtschuster Aug 30, 2023
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
3 changes: 3 additions & 0 deletions src/coreclr/vm/dllimport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3316,8 +3316,11 @@ BOOL NDirect::MarshalingRequired(
FALLTHROUGH;

case ELEMENT_TYPE_VALUETYPE:
case ELEMENT_TYPE_GENERICINST:
{
TypeHandle hndArgType = arg.GetTypeHandleThrowing(pModule, &emptyTypeContext);
if(!hndArgType.IsValueType())
return true;

if (hndArgType.GetMethodTable()->IsInt128OrHasInt128Fields())
{
Expand Down
24 changes: 24 additions & 0 deletions src/tests/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public static int Main(string[] args)
NegativeTest_FromInstantiatedGenericClass();
TestUnmanagedCallersOnlyViaUnmanagedCalli();
TestPInvokeMarkedWithUnmanagedCallersOnly();
TestUnmanagedCallersOnlyWithGeneric();

// Exception handling is only supported on CoreCLR Windows.
if (TestLibrary.Utilities.IsWindows && !TestLibrary.Utilities.IsMonoRuntime)
Expand Down Expand Up @@ -217,4 +218,27 @@ public static void TestPInvokeMarkedWithUnmanagedCallersOnly()
int n = 1234;
Assert.Throws<NotSupportedException>(() => ((delegate* unmanaged<int, int>)&CallingUnmanagedCallersOnlyDirectly.PInvokeMarkedWithUnmanagedCallersOnly)(n));
}

public static void TestUnmanagedCallersOnlyWithGeneric()
{
Assert.Equal(0, ((delegate* unmanaged<Blittable<nint>, int>)&BlittableGenericStruct)(new Blittable<nint>()));

Assert.Equal(0, ((delegate* unmanaged<MaybeBlittable<nint>, int>)&MaybeBlittableGenericStruct)(new MaybeBlittable<nint>()));
}

internal struct Blittable<T> where T : unmanaged
{
T Value;
}

internal struct MaybeBlittable<T>
{
T Value;
}

[UnmanagedCallersOnly]
internal static int BlittableGenericStruct(Blittable<nint> param) => 0;

[UnmanagedCallersOnly]
internal static int MaybeBlittableGenericStruct(MaybeBlittable<nint> param) => 0;
}