Fix issue with reflection invoke and pointer types (#92922)

MichalStrehovsky · web-flow · commit 213833ea99b7 · 2023-10-04T11:32:56.000+02:00
diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/DynamicInvokeInfo.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Reflection/DynamicInvokeInfo.cs
@@ -769,13 +769,11 @@ private unsafe void CopyBackToArray(ref object? src, object?[] dest)
                         Debug.Assert(type.IsPointer);
                         obj = Pointer.Box((void*)Unsafe.As<byte, IntPtr>(ref obj.GetRawData()), type);
                     }
-                    if ((transform & Transform.FunctionPointer) != 0)
-                    {
-                        obj = RuntimeImports.RhBox(EETypePtr.EETypePtrOf<IntPtr>(), ref obj.GetRawData());
-                    }
                     else
                     {
-                        obj = RuntimeImports.RhBox(argumentInfo.Type, ref obj.GetRawData());
+                        obj = RuntimeImports.RhBox(
+                            (transform & Transform.FunctionPointer) != 0 ? EETypePtr.EETypePtrOf<IntPtr>() : argumentInfo.Type,
+                            ref obj.GetRawData());
                     }
                 }
 
@@ -806,13 +804,11 @@ private unsafe void CopyBackToSpan(Span<object?> src, Span<object?> dest)
                         Debug.Assert(type.IsPointer);
                         obj = Pointer.Box((void*)Unsafe.As<byte, IntPtr>(ref obj.GetRawData()), type);
                     }
-                    if ((transform & Transform.FunctionPointer) != 0)
-                    {
-                        obj = RuntimeImports.RhBox(EETypePtr.EETypePtrOf<IntPtr>(), ref obj.GetRawData());
-                    }
                     else
                     {
-                        obj = RuntimeImports.RhBox(argumentInfo.Type, ref obj.GetRawData());
+                        obj = RuntimeImports.RhBox(
+                            (transform & Transform.FunctionPointer) != 0 ? EETypePtr.EETypePtrOf<IntPtr>() : argumentInfo.Type,
+                            ref obj.GetRawData());
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -769,13 +769,11 @@ private unsafe void CopyBackToArray(ref object? src, object?[] dest)`
`769`	`769`	`Debug.Assert(type.IsPointer);`
`770`	`770`	`obj = Pointer.Box((void*)Unsafe.As<byte, IntPtr>(ref obj.GetRawData()), type);`
`771`	`771`	`}`
`772`		`- if ((transform & Transform.FunctionPointer) != 0)`
`773`		`- {`
`774`		`- obj = RuntimeImports.RhBox(EETypePtr.EETypePtrOf<IntPtr>(), ref obj.GetRawData());`
`775`		`- }`
`776`	`772`	`else`
`777`	`773`	`{`
`778`		`- obj = RuntimeImports.RhBox(argumentInfo.Type, ref obj.GetRawData());`
	`774`	`+ obj = RuntimeImports.RhBox(`
	`775`	`+ (transform & Transform.FunctionPointer) != 0 ? EETypePtr.EETypePtrOf<IntPtr>() : argumentInfo.Type,`
	`776`	`+ ref obj.GetRawData());`
`779`	`777`	`}`
`780`	`778`	`}`
`781`	`779`
`@@ -806,13 +804,11 @@ private unsafe void CopyBackToSpan(Span<object?> src, Span<object?> dest)`
`806`	`804`	`Debug.Assert(type.IsPointer);`
`807`	`805`	`obj = Pointer.Box((void*)Unsafe.As<byte, IntPtr>(ref obj.GetRawData()), type);`
`808`	`806`	`}`
`809`		`- if ((transform & Transform.FunctionPointer) != 0)`
`810`		`- {`
`811`		`- obj = RuntimeImports.RhBox(EETypePtr.EETypePtrOf<IntPtr>(), ref obj.GetRawData());`
`812`		`- }`
`813`	`807`	`else`
`814`	`808`	`{`
`815`		`- obj = RuntimeImports.RhBox(argumentInfo.Type, ref obj.GetRawData());`
	`809`	`+ obj = RuntimeImports.RhBox(`
	`810`	`+ (transform & Transform.FunctionPointer) != 0 ? EETypePtr.EETypePtrOf<IntPtr>() : argumentInfo.Type,`
	`811`	`+ ref obj.GetRawData());`
`816`	`812`	`}`
`817`	`813`	`}`
`818`	`814`