Skip to content

Commit

Permalink
Reenable unmanagedcallersonly related tests (#35926)
Browse files Browse the repository at this point in the history 
* Reenable UnmanagedCallersOnlyAttribute tests

* Reenable Vector2_3_4 tests.

* Reenable MarshalSeqStruct/ReversePInvoke tests.
  • Loading branch information
@AaronRobinsonMSFT
AaronRobinsonMSFT authored May 7, 2020
1 parent 43f948b commit c2b1018
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 22 deletions.
8 changes: 7 additions & 1 deletion src/coreclr/src/vm/jitinterface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12425,7 +12425,13 @@ CorJitResult CallCompileMethodWithSEHWrapper(EEJitManager *jitMgr,
#if !defined(TARGET_X86)
if (ftn->HasUnmanagedCallersOnlyAttribute())
{
COMDelegate::ThrowIfInvalidUnmanagedCallersOnlyUsage(ftn);
// If the stub was generated by the runtime, don't validate
// it for UnmanagedCallersOnlyAttribute usage. There are cases
// where the validation doesn't handle all of the cases we can
// permit during stub generation (e.g. Vector2 returns).
if (!ftn->IsILStub())
COMDelegate::ThrowIfInvalidUnmanagedCallersOnlyUsage(ftn);

flags.Set(CORJIT_FLAGS::CORJIT_FLAG_REVERSE_PINVOKE);
}
#endif // !TARGET_X86
Expand Down
9 changes: 0 additions & 9 deletions src/coreclr/tests/issues.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,6 @@
<ExcludeList Include="$(XunitTestBinBase)/JIT/SIMD/Vector3Interop_ro/*">
<Issue>https://github.com/dotnet/runtime/issues/35798</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Interop/StructMarshalling/ReversePInvoke/MarshalSeqStruct/ReversePInvoke/ReversePInvokeTest/*">
<Issue>https://github.com/dotnet/runtime/issues/35798</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Interop/PInvoke/Vector2_3_4/Vector2_3_4/*">
<Issue>https://github.com/dotnet/runtime/issues/35798</Issue>
</ExcludeList>
<ExcludeList Include="$(XunitTestBinBase)/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest/*">
<Issue>https://github.com/dotnet/runtime/issues/35798</Issue>
</ExcludeList>
</ItemGroup>

<!-- All OS/Arch CoreCLR excludes -->
Expand Down
7 changes: 5 additions & 2 deletions src/coreclr/tests/src/Interop/PInvoke/Vector2_3_4/Vector2_3_4.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@ public static int Main()
}
catch (System.Exception ex)
{
Console.WriteLine(ex.ToString());
Console.WriteLine(ex);
return 101;
}
return 100;
}

private static void RunVector2Tests()
{
Console.WriteLine($"Running {nameof(RunVector2Tests)}... ");
float X = StartingIntValue;
float Y = StartingIntValue + 1;
float Z = StartingIntValue + 232;
Expand Down Expand Up @@ -68,9 +69,10 @@ private static void RunVector2Tests()
return newVector;
}));
}

private static void RunVector3Tests()
{
Console.WriteLine($"Running {nameof(RunVector3Tests)}... ");
float X = StartingIntValue;
float Y = StartingIntValue + 1;
float Z = StartingIntValue + 232;
Expand Down Expand Up @@ -112,6 +114,7 @@ private static void RunVector3Tests()

private static void RunVector4Tests()
{
Console.WriteLine($"Running {nameof(RunVector4Tests)}... ");
float X = StartingIntValue;
float Y = StartingIntValue + 1;
float Z = StartingIntValue + 232;
Expand Down
63 changes: 53 additions & 10 deletions src/coreclr/tests/src/Interop/UnmanagedCallersOnly/UnmanagedCallersOnlyTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,10 @@ void CallAsDelegate()
}

[UnmanagedCallersOnly]
public void CallbackNonStatic()
public int CallbackNonStatic(int val)
{
Assert.Fail($"Instance functions with attribute {nameof(UnmanagedCallersOnlyAttribute)} are invalid");
return -1;
}

public static void NegativeTest_NonStaticMethod()
Expand All @@ -284,9 +285,14 @@ void TestUnmanagedCallersOnlyNonStatic()
{
.locals init ([0] native int ptr)
IL_0000: nop
IL_0001: ldftn void CallbackNonStatic()
IL_0001: ldftn int CallbackNonStatic(int)
IL_0007: stloc.0
IL_0008: ret
IL_0008: ldloc.0
IL_0009: ldc.i4 <n> local
IL_000e: call bool UnmanagedCallersOnlyDll::CallManagedProc(native int, int)
IL_0013: ret
}
*/
DynamicMethod testUnmanagedCallersOnly = new DynamicMethod("TestUnmanagedCallersOnlyNonStatic", null, null, typeof(Program).Module);
Expand All @@ -297,18 +303,24 @@ .locals init ([0] native int ptr)
// Get native function pointer of the callback
il.Emit(OpCodes.Ldftn, typeof(Program).GetMethod(nameof(CallbackNonStatic)));
il.Emit(OpCodes.Stloc_0);
il.Emit(OpCodes.Ldloc_0);

int n = 12345;
il.Emit(OpCodes.Ldc_I4, n);
il.Emit(OpCodes.Call, typeof(UnmanagedCallersOnlyDll).GetMethod("CallManagedProc"));
il.Emit(OpCodes.Ret);

var testNativeMethod = (NativeMethodInvoker)testUnmanagedCallersOnly.CreateDelegate(typeof(NativeMethodInvoker));

// Try invoking method
Assert.Throws<InvalidProgramException>(() => { testNativeMethod(); });
}

[UnmanagedCallersOnly]
public static void CallbackMethodNonBlittable(bool x1)
public static int CallbackMethodNonBlittable(bool x1)
{
Assert.Fail($"Functions with attribute {nameof(UnmanagedCallersOnlyAttribute)} cannot have non-blittable arguments");
return -1;
}

public static void NegativeTest_NonBlittable()
Expand All @@ -320,9 +332,14 @@ void TestUnmanagedCallersOnlyNonBlittable()
{
.locals init ([0] native int ptr)
IL_0000: nop
IL_0001: ldftn void CallbackMethodNonBlittable(bool)
IL_0001: ldftn int CallbackMethodNonBlittable(bool)
IL_0007: stloc.0
IL_0008: ret
IL_0008: ldloc.0
IL_0009: ldc.i4 <n> local
IL_000e: call bool UnmanagedCallersOnlyDll::CallManagedProc(native int, int)
IL_0013: ret
}
*/
DynamicMethod testUnmanagedCallersOnly = new DynamicMethod("TestUnmanagedCallersOnlyNonBlittable", null, null, typeof(Program).Module);
Expand All @@ -333,18 +350,24 @@ .locals init ([0] native int ptr)
// Get native function pointer of the callback
il.Emit(OpCodes.Ldftn, typeof(Program).GetMethod(nameof(CallbackMethodNonBlittable)));
il.Emit(OpCodes.Stloc_0);
il.Emit(OpCodes.Ldloc_0);

int n = 12345;
il.Emit(OpCodes.Ldc_I4, n);
il.Emit(OpCodes.Call, typeof(UnmanagedCallersOnlyDll).GetMethod("CallManagedProc"));
il.Emit(OpCodes.Ret);

var testNativeMethod = (NativeMethodInvoker)testUnmanagedCallersOnly.CreateDelegate(typeof(NativeMethodInvoker));

// Try invoking method
Assert.Throws<InvalidProgramException>(() => { testNativeMethod(); });
}

[UnmanagedCallersOnly]
public static void CallbackMethodGeneric<T>(T arg)
public static int CallbackMethodGeneric<T>(T arg)
{
Assert.Fail($"Functions with attribute {nameof(UnmanagedCallersOnlyAttribute)} cannot have generic arguments");
return -1;
}

public static void NegativeTest_NonInstantiatedGenericArguments()
Expand Down Expand Up @@ -388,7 +411,12 @@ .locals init ([0] native int ptr)
IL_0000: nop
IL_0001: ldftn void CallbackMethodGeneric(int)
IL_0007: stloc.0
IL_0008: ret
IL_0008: ldloc.0
IL_0009: ldc.i4 <n> local
IL_000e: call bool UnmanagedCallersOnlyDll::CallManagedProc(native int, int)
IL_0013: ret
}
*/
DynamicMethod testUnmanagedCallersOnly = new DynamicMethod("TestUnmanagedCallersOnlyInstGenericArguments", null, null, typeof(Program).Module);
Expand All @@ -399,8 +427,13 @@ .locals init ([0] native int ptr)
// Get native function pointer of the instantiated generic callback
il.Emit(OpCodes.Ldftn, typeof(Program).GetMethod(nameof(CallbackMethodGeneric)).MakeGenericMethod(new [] { typeof(int) }));
il.Emit(OpCodes.Stloc_0);
il.Emit(OpCodes.Ldloc_0);

int n = 12345;
il.Emit(OpCodes.Ldc_I4, n);
il.Emit(OpCodes.Call, typeof(UnmanagedCallersOnlyDll).GetMethod("CallManagedProc"));
il.Emit(OpCodes.Ret);

var testNativeMethod = (NativeMethodInvoker)testUnmanagedCallersOnly.CreateDelegate(typeof(NativeMethodInvoker));

// Try invoking method
Expand All @@ -425,9 +458,14 @@ void TestUnmanagedCallersOnlyInstGenericType()
{
.locals init ([0] native int ptr)
IL_0000: nop
IL_0001: ldftn void GenericClass<int>::CallbackMethod(int)
IL_0001: ldftn int GenericClass<int>::CallbackMethod(int)
IL_0007: stloc.0
IL_0008: ret
IL_0008: ldloc.0
IL_0009: ldc.i4 <n> local
IL_000e: call bool UnmanagedCallersOnlyDll::CallManagedProc(native int, int)
IL_0013: ret
}
*/
DynamicMethod testUnmanagedCallersOnly = new DynamicMethod("TestUnmanagedCallersOnlyInstGenericClass", null, null, typeof(Program).Module);
Expand All @@ -438,8 +476,13 @@ .locals init ([0] native int ptr)
// Get native function pointer of the callback from the instantiated generic class.
il.Emit(OpCodes.Ldftn, typeof(GenericClass<int>).GetMethod(nameof(GenericClass<int>.CallbackMethod)));
il.Emit(OpCodes.Stloc_0);
il.Emit(OpCodes.Ldloc_0);

int n = 12345;
il.Emit(OpCodes.Ldc_I4, n);
il.Emit(OpCodes.Call, typeof(UnmanagedCallersOnlyDll).GetMethod("CallManagedProc"));
il.Emit(OpCodes.Ret);

var testNativeMethod = (NativeMethodInvoker)testUnmanagedCallersOnly.CreateDelegate(typeof(NativeMethodInvoker));

// Try invoking method
Expand Down

0 comments on commit c2b1018

Please sign in to comment.