Move test

Author: jkotas

src/tests/Interop/MarshalAPI/FunctionPointer/GenericFunctionPointer.cs

@@ -29,6 +29,12 @@ static BlittableGeneric<string> UnmanagedExportedFunctionBlittableGenericString(
         return new() { X = Convert.ToInt32(arg) };
     }
 
+    [UnmanagedCallersOnly]
+    static void UnmanagedExportedFunctionRefInt(ref int val, float arg)
+    {
+        val = Convert.ToInt32(arg);
+    }
+
     class GenericCaller<T>
     {
         internal static unsafe T GenericCalli<U>(void* fnptr, U arg)
@@ -40,6 +46,11 @@ internal static unsafe BlittableGeneric<T> WrappedGenericCalli<U>(void* fnptr, U
         {
             return ((delegate* unmanaged<U, BlittableGeneric<T>>)fnptr)(arg);
         }
+
+        internal static unsafe void NonGenericCalli<T>(void* fnptr, ref int val, float arg)
+        {
+            ((delegate* unmanaged<float, ref int, void>)fnptr)(ref val, arg);
+        }
     }
 
     struct BlittableGeneric<T>
@@ -81,6 +92,14 @@ public static void RunGenericFunctionPointerTest(float inVal)
             outVar = GenericCaller<string>.WrappedGenericCalli((delegate* unmanaged<float, BlittableGeneric<string>>)&UnmanagedExportedFunctionBlittableGenericString, inVal).X;
         }
         Assert.Equal(expectedValue, outVar);
+
+        outVar = 0;
+        Console.WriteLine("Testing non-GenericCalli with non-blittable argument in a generic caller");
+        unsafe
+        {
+            GenericCaller<string>.NonGenericCalli<string>((delegate* unmanaged<float, ref int, void>)&UnmanagedExportedFunctionRefInt, ref outVar, inVal);
+        }
+        Assert.Equal(expectedValue, outVar);
     }
 
     [ConditionalFact(nameof(CanRunInvalidGenericFunctionPointerTest))]

src/tests/nativeaot/SmokeTests/PInvoke/PInvoke.cs

@@ -346,8 +346,6 @@ public static int Main()
             TestForwardDelegateWithUnmanagedCallersOnly();
             TestDecimal();
             TestDifferentModopts();
-            TestGenericCaller<int>();
-            TestGenericCaller<string>();
             TestFunctionPointers();
 
             return 100;
@@ -1170,17 +1168,6 @@ public static unsafe void TestDifferentModopts()
                 refStdcallSuppressTransition(ref storage, 56);
             }
         }
-
-        public static unsafe void TestGenericCaller<T>()
-        {
-            byte storage;
-
-            delegate* unmanaged<byte*, byte, void> unmanagedMethod = &UnmanagedMethod;
-
-            var outUnmanagedMethod = (delegate* unmanaged<out byte, byte, void>)unmanagedMethod;
-            outUnmanagedMethod(out storage, 12);
-            ThrowIfNotEquals(storage, 12, "Out unmanaged call failed.");
-        }
     }
 
     public class SafeMemoryHandle : SafeHandle //SafeHandle subclass