feeedback

Author: pavelsavara

src/libraries/Common/tests/TestUtilities/System/PlatformDetection.cs

@@ -33,6 +33,7 @@ public static partial class PlatformDetection
         public static bool IsNotMonoInterpreter => !IsMonoInterpreter;
         public static bool IsMonoAOT => Environment.GetEnvironmentVariable("MONO_AOT_MODE") == "aot";
         public static bool IsNotMonoAOT => Environment.GetEnvironmentVariable("MONO_AOT_MODE") != "aot";
+        public static bool IsNotMonoAOTOrBrowser => IsNotMonoAOT && !IsBrowser;
         public static bool IsNativeAot => IsNotMonoRuntime && !IsReflectionEmitSupported;
         public static bool IsNotNativeAot => !IsNativeAot;
         public static bool IsFreeBSD => RuntimeInformation.IsOSPlatform(OSPlatform.Create("FREEBSD"));

src/libraries/System.Private.CoreLib/src/Internal/Runtime/InteropServices/ComponentActivator.cs

@@ -350,7 +350,9 @@ private static IntPtr InternalGetFunctionPointer(AssemblyLoadContext alc,
             {
                 Delegate d = Delegate.CreateDelegate(delegateType, type, methodName)!;
 
+#pragma warning disable CA1416 // This call site is reachable on all platforms.
                 functionPtr = Marshal.GetFunctionPointerForDelegate(d);
+#pragma warning restore CA1416
 
                 lock (s_delegates)
                 {

src/libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.cs

@@ -1137,15 +1137,21 @@ public static TDelegate GetDelegateForFunctionPointer<TDelegate>(IntPtr ptr)
 
         [RequiresDynamicCode("Marshalling code for the delegate might not be available. Use the GetFunctionPointerForDelegate<TDelegate> overload instead.")]
         [EditorBrowsable(EditorBrowsableState.Never)]
+        [System.Runtime.Versioning.SupportedOSPlatformAttribute("browser")]
+        [System.Runtime.Versioning.SupportedOSPlatformAttribute("wasi")]
         public static IntPtr GetFunctionPointerForDelegate(Delegate d)
         {
             ArgumentNullException.ThrowIfNull(d);
 
+            if (OperatingSystem.IsWasi() || OperatingSystem.IsBrowser()) throw new PlatformNotSupportedException(SR.PlatformNotSupported_DynamicEntrypoint);
+
             return GetFunctionPointerForDelegateInternal(d);
         }
 
         [UnconditionalSuppressMessage("AotAnalysis", "IL3050:AotUnfriendlyApi",
             Justification = "AOT compilers can see the T.")]
+        [System.Runtime.Versioning.SupportedOSPlatformAttribute("browser")]
+        [System.Runtime.Versioning.SupportedOSPlatformAttribute("wasi")]
         public static IntPtr GetFunctionPointerForDelegate<TDelegate>(TDelegate d) where TDelegate : notnull
         {
             return GetFunctionPointerForDelegate((Delegate)(object)d);

src/libraries/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs

@@ -1070,7 +1070,11 @@ public static void FreeHGlobal(System.IntPtr hglobal) { }
         public static System.IntPtr GetExceptionPointers() { throw null; }
         [System.Diagnostics.CodeAnalysis.RequiresDynamicCode("Marshalling code for the delegate might not be available. Use the GetFunctionPointerForDelegate<TDelegate> overload instead.")]
         [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        [System.Runtime.Versioning.SupportedOSPlatformAttribute("browser")]
+        [System.Runtime.Versioning.SupportedOSPlatformAttribute("wasi")]
         public static System.IntPtr GetFunctionPointerForDelegate(System.Delegate d) { throw null; }
+        [System.Runtime.Versioning.SupportedOSPlatformAttribute("browser")]
+        [System.Runtime.Versioning.SupportedOSPlatformAttribute("wasi")]
         public static System.IntPtr GetFunctionPointerForDelegate<TDelegate>(TDelegate d) where TDelegate : notnull { throw null; }
         [System.Diagnostics.CodeAnalysis.RequiresAssemblyFiles("Windows only assigns HINSTANCE to assemblies loaded from disk. This API will return -1 for modules without a file on disk.")]
         public static System.IntPtr GetHINSTANCE(System.Reflection.Module m) { throw null; }

src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System/Runtime/InteropServices/Marshal/GetDelegateForFunctionPointerTests.cs

@@ -11,7 +11,7 @@
 
 namespace System.Runtime.InteropServices.Tests
 {
-    [ActiveIssue("https://github.com/dotnet/runtime/issues/39187", TestPlatforms.Browser)]
+    [ConditionalClass(typeof(PlatformDetection), nameof(PlatformDetection.IsNotBrowser))]
     public class GetDelegateForFunctionPointerTests
     {
         [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]

src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System/Runtime/InteropServices/Marshal/GetFunctionPointerForDelegateTests.cs

@@ -10,8 +10,7 @@ namespace System.Runtime.InteropServices.Tests
 {
     public class GetFunctionPointerForDelegateTests
     {
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/39187", TestPlatforms.Browser)]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOTOrBrowser))]
         public void GetFunctionPointerForDelegate_NormalDelegateNonGeneric_ReturnsExpected()
         {
             MethodInfo targetMethod = typeof(GetFunctionPointerForDelegateTests).GetMethod(nameof(Method), BindingFlags.NonPublic | BindingFlags.Static);
@@ -23,8 +22,7 @@ public void GetFunctionPointerForDelegate_NormalDelegateNonGeneric_ReturnsExpect
             Assert.Equal(pointer1, pointer2);
         }
 
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/39187", TestPlatforms.Browser)]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOTOrBrowser))]
         public void GetFunctionPointerForDelegate_MarshalledDelegateNonGeneric_ReturnsExpected()
         {
             MethodInfo targetMethod = typeof(GetFunctionPointerForDelegateTests).GetMethod(nameof(Method), BindingFlags.NonPublic | BindingFlags.Static);
@@ -40,8 +38,7 @@ public void GetFunctionPointerForDelegate_MarshalledDelegateNonGeneric_ReturnsEx
             Assert.Equal(pointer1, pointer2);
         }
 
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/39187", TestPlatforms.Browser)]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOTOrBrowser))]
         public void GetFunctionPointerForDelegate_NormalDelegateGeneric_ReturnsExpected()
         {
             MethodInfo targetMethod = typeof(GetFunctionPointerForDelegateTests).GetMethod(nameof(Method), BindingFlags.NonPublic | BindingFlags.Static);
@@ -53,8 +50,7 @@ public void GetFunctionPointerForDelegate_NormalDelegateGeneric_ReturnsExpected(
             Assert.Equal(pointer1, pointer2);
         }
 
-        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOT))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/39187", TestPlatforms.Browser)]
+        [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotMonoAOTOrBrowser))]
         public void GetFunctionPointerForDelegate_MarshalledDelegateGeneric_ReturnsExpected()
         {
             MethodInfo targetMethod = typeof(GetFunctionPointerForDelegateTests).GetMethod(nameof(Method), BindingFlags.NonPublic | BindingFlags.Static);

src/mono/browser/runtime/runtime.c

@@ -197,6 +197,8 @@ init_icall_table (void)
 static void*
 get_native_to_interp (MonoMethod *method, void *extra_arg)
 {
+	assert (method);
+
 	void *addr = NULL;
 	MONO_ENTER_GC_UNSAFE;
 	MonoClass *klass = mono_method_get_class (method);

src/mono/mono/mini/interp/interp.c

@@ -3469,6 +3469,14 @@ interp_create_method_pointer (MonoMethod *method, gboolean compile, MonoError *e
 	if (method->wrapper_type == MONO_WRAPPER_NATIVE_TO_MANAGED) {
 		WrapperInfo *info = mono_marshal_get_wrapper_info (method);
 		MonoMethod *orig_method = info->d.native_to_managed.method;
+		if (!orig_method) {
+			char *s = mono_method_get_full_name (method);
+			char *msg = g_strdup_printf ("No native to managed transition for method '%s', missing [UnmanagedCallersOnly] attribute.", s);
+			mono_error_set_platform_not_supported (error, msg);
+			g_free (s);
+			g_free (msg);
+			return NULL;
+		}
 
 		/*
 		 * These are called from native code. Ask the host app for a trampoline.