Skip to content

Support invoke of function pointer type arg #90270

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 5 commits into from
Aug 14, 2023
Merged

Support invoke of function pointer type arg #90270

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6d616d3
Support invoke of function pointer type arg
steveharter Aug 9, 2023
70e7908
Remove comment
steveharter Aug 10, 2023
f214ec9
Enable test; fix NativeAot return of fcnptr
steveharter Aug 12, 2023
07f600a
Merge branch 'main' of https://github.com/steveharter/runtime into Fc…
steveharter Aug 12, 2023
69695b8
Remove Mono workaround; fix Mono to use fcnptr types; add tests
steveharter Aug 12, 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
5 changes: 5 additions & 0 deletions src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/DynamicInvokeInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,6 +838,11 @@ private unsafe object ReturnTransform(ref byte byref, bool wrapInTargetInvocatio
Debug.Assert(type.IsPointer);
obj = Pointer.Box((void*)Unsafe.As<byte, IntPtr>(ref byref), type);
}
else if ((_returnTransform & Transform.FunctionPointer) != 0)
Copy link
Contributor Author

@steveharter steveharter Aug 14, 2023

Choose a reason for hiding this comment

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

Without this change, a checked build would throw in the else statement below where it tried to box _returnType.

{
Debug.Assert(Type.GetTypeFromMethodTable(_returnType.ToPointer()).IsFunctionPointer);
obj = RuntimeImports.RhBox(EETypePtr.EETypePtrOf<IntPtr>(), ref byref);
}
else if ((_returnTransform & Transform.Reference) != 0)
{
Debug.Assert((_returnTransform & Transform.ByRef) != 0);
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Reflection/tests/MethodInfoTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,7 @@ private static void SecondCall(MethodInfo mi)
Assert.Contains("TestAssembly", asm.ToString());
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71095", TestRuntimes.Mono)]
private static unsafe void TestFunctionPointersWithFunctionPointerArgs()
{
Expand All @@ -911,7 +912,6 @@ private static unsafe void TestFunctionPointersWithFunctionPointerArgs()
Assert.True((IntPtr)ret != 0);
}

// Mono will throw System.ArgumentException : Object of type 'System.IntPtr' cannot be converted to type 'System.Boolean(System.Int32)'.
[Fact]
private static unsafe void TestFunctionPointersWithIntPtrArgs()
{
Expand Down