[browser][MT] cleanup (#98672)

Co-authored-by: Marek Fišera <mara@neptuo.com>
dotnet · Feb 21, 2024 · 32929b6 · 32929b6
1 parent 82e2360
commit 32929b6
Show file tree

Hide file tree

Showing 44 changed files with 421 additions and 299 deletions.
diff --git a/...ces.JavaScript/src/System/Runtime/InteropServices/JavaScript/Interop/JavaScriptExports.cs b/...ces.JavaScript/src/System/Runtime/InteropServices/JavaScript/Interop/JavaScriptExports.cs
@@ -45,7 +45,7 @@ public static void CallEntrypoint(JSMarshalerArgument* arguments_buffer)
             }
             catch (Exception ex)
             {
-                Environment.FailFast("CallEntrypoint: Unexpected synchronous failure. " + ex);
+                Environment.FailFast($"CallEntrypoint: Unexpected synchronous failure (ManagedThreadId {Environment.CurrentManagedThreadId}): " + ex);
             }
         }
 
@@ -110,7 +110,7 @@ public static void ReleaseJSOwnedObjectByGCHandle(JSMarshalerArgument* arguments
             }
             catch (Exception ex)
             {
-                Environment.FailFast("ReleaseJSOwnedObjectByGCHandle: Unexpected synchronous failure. " + ex);
+                Environment.FailFast($"ReleaseJSOwnedObjectByGCHandle: Unexpected synchronous failure (ManagedThreadId {Environment.CurrentManagedThreadId}): " + ex);
             }
         }
 
@@ -205,7 +205,7 @@ public static void CompleteTask(JSMarshalerArgument* arguments_buffer)
             }
             catch (Exception ex)
             {
-                Environment.FailFast("CompleteTask: Unexpected synchronous failure. " + ex);
+                Environment.FailFast($"CompleteTask: Unexpected synchronous failure (ManagedThreadId {Environment.CurrentManagedThreadId}): " + ex);
             }
         }
 
@@ -280,7 +280,7 @@ public static void BindAssemblyExports(JSMarshalerArgument* arguments_buffer)
             }
             catch (Exception ex)
             {
-                Environment.FailFast("BindAssemblyExports: Unexpected synchronous failure. " + ex);
+                Environment.FailFast($"BindAssemblyExports: Unexpected synchronous failure (ManagedThreadId {Environment.CurrentManagedThreadId}): " + ex);
             }
         }
 

diff --git a/...ropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSFunctionBinding.cs b/...ropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSFunctionBinding.cs
@@ -151,7 +151,9 @@ internal unsafe JSBindingType this[int position]
         /// </summary>
         /// <param name="signature">Generated metadata about the method signature used for marshaling.</param>
         /// <param name="arguments">The intermediate buffer with marshalled arguments.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public static void InvokeJS(JSFunctionBinding signature, Span<JSMarshalerArgument> arguments)
         {
             InvokeJSImportImpl(signature, arguments);

diff --git a/...untime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSHost.cs b/...untime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSHost.cs
@@ -44,7 +44,9 @@ public static JSObject DotnetInstance
         /// <param name="moduleUrl">The location of the module file.</param>
         /// <param name="cancellationToken">The token to monitor for cancellation requests.</param>
         /// <returns>A proxy for the JavaScript object that contains the module's exports.</returns>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public static Task<JSObject> ImportAsync(string moduleName, string moduleUrl, CancellationToken cancellationToken = default)
         {
             return JSHostImplementation.ImportAsync(moduleName, moduleUrl, cancellationToken);

diff --git a/...Services.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSHostImplementation.cs b/...Services.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSHostImplementation.cs
@@ -64,7 +64,9 @@ public static MethodInfo GetTaskResultMethodInfo(Type taskType)
             throw new InvalidOperationException();
         }
 
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public static void ThrowException(ref JSMarshalerArgument arg)
         {
             arg.ToManaged(out Exception? ex);
@@ -85,7 +87,9 @@ public static async Task<JSObject> ImportAsync(string moduleName, string moduleU
                 ConfigureAwaitOptions.ForceYielding); // this helps to finish the import before we bind the module in [JSImport]
         }
 
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public static async Task<JSObject> CancellationHelper(Task<JSObject> jsTask, CancellationToken cancellationToken)
         {
             if (jsTask.IsCompletedSuccessfully)
@@ -293,6 +297,7 @@ public static unsafe JSFunctionBinding BindManagedFunction(string fullyQualified
 
             var signature = GetMethodSignature(signatures, null, null);
 
+            // this will hit JS side possibly on another thread, depending on JSProxyContext.CurrentThreadContext
             JavaScriptImports.BindCSFunction(monoMethod, assemblyName, nameSpace, shortClassName, methodName, signatureHash, (IntPtr)signature.Header);
 
             FreeMethodSignatureBuffer(signature);
@@ -310,7 +315,9 @@ public static void SetHasExternalEventLoop(Thread thread)
         }
 #endif
 
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public static RuntimeMethodHandle GetMethodHandleFromIntPtr(IntPtr ptr)
         {
             var temp = new IntPtrAndHandle { ptr = ptr };

diff --git a/...pServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSMarshalerArgument.cs b/...pServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSMarshalerArgument.cs
@@ -71,7 +71,9 @@ internal struct JSMarshalerArgumentImpl
         /// <summary>
         /// This API supports JSImport infrastructure and is not intended to be used directly from your code.
         /// </summary>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public unsafe void Initialize()
         {
             slot.Type = MarshalerType.None;
@@ -85,7 +87,9 @@ public unsafe void Initialize()
         }
 
 #if FEATURE_WASM_MANAGED_THREADS
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         internal unsafe void InitializeWithContext(JSProxyContext knownProxyContext)
         {
             slot.Type = MarshalerType.None;
@@ -111,11 +115,11 @@ internal JSProxyContext ToManagedContext
                 // during JSExport, this is marshaling parameters and it would be set by:
                 //    - alloc_stack_frame
                 //    - set_js_handle/set_gc_handle
-                var proxyContextGCHandle = (GCHandle)slot.ContextHandle;
-                if (proxyContextGCHandle == default)
+                if (slot.ContextHandle == IntPtr.Zero)
                 {
-                    Environment.FailFast($"ContextHandle not set, ManagedThreadId: {Environment.CurrentManagedThreadId}. {Environment.NewLine} {Environment.StackTrace}");
+                    Environment.FailFast($"ContextHandle not set (ManagedThreadId {Environment.CurrentManagedThreadId}): {Environment.NewLine} {Environment.StackTrace}");
                 }
+                var proxyContextGCHandle = (GCHandle)slot.ContextHandle;
                 var argumentContext = (JSProxyContext)proxyContextGCHandle.Target!;
                 return argumentContext;
 #endif

diff --git a/...pServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSObject.References.cs b/...pServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSObject.References.cs
@@ -42,7 +42,9 @@ internal JSObject(IntPtr jsHandle, JSProxyContext ctx)
         /// <inheritdoc />
         public override string ToString() => $"(js-obj js '{JSHandle}')";
 
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         internal void AssertNotDisposed()
         {
             lock (ProxyContext)

diff --git a/...nteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSProxyContext.cs b/...nteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/JSProxyContext.cs
@@ -41,7 +41,9 @@ private JSProxyContext()
         public bool IsMainThread;
         public JSSynchronizationContext SynchronizationContext;
 
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public bool IsCurrentThread()
         {
             return ManagedTID == Environment.CurrentManagedThreadId;
@@ -232,7 +234,9 @@ public static JSProxyContext CurrentOperationContext
 
 #endif
 
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public static JSProxyContext AssertIsInteropThread()
         {
 #if FEATURE_WASM_MANAGED_THREADS

diff --git a/.../src/System/Runtime/InteropServices/JavaScript/Marshaling/JSMarshalerArgument.BigInt64.cs b/.../src/System/Runtime/InteropServices/JavaScript/Marshaling/JSMarshalerArgument.BigInt64.cs
@@ -12,7 +12,9 @@ public partial struct JSMarshalerArgument
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public unsafe void ToManagedBig(out long value)
         {
             if (slot.Type == MarshalerType.None)
@@ -28,7 +30,9 @@ public unsafe void ToManagedBig(out long value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public void ToJSBig(long value)
         {
             slot.Type = MarshalerType.BigInt64;
@@ -40,7 +44,9 @@ public void ToJSBig(long value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public unsafe void ToManagedBig(out long? value)
         {
             if (slot.Type == MarshalerType.None)
@@ -56,7 +62,9 @@ public unsafe void ToManagedBig(out long? value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public void ToJSBig(long? value)
         {
             if (value.HasValue)

diff --git a/...ript/src/System/Runtime/InteropServices/JavaScript/Marshaling/JSMarshalerArgument.Bool.cs b/...ript/src/System/Runtime/InteropServices/JavaScript/Marshaling/JSMarshalerArgument.Bool.cs
@@ -12,7 +12,9 @@ public partial struct JSMarshalerArgument
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public unsafe void ToManaged(out bool value)
         {
             if (slot.Type == MarshalerType.None)
@@ -28,7 +30,9 @@ public unsafe void ToManaged(out bool value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public void ToJS(bool value)
         {
             slot.Type = MarshalerType.Boolean;
@@ -40,7 +44,9 @@ public void ToJS(bool value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public unsafe void ToManaged(out bool? value)
         {
             if (slot.Type == MarshalerType.None)
@@ -56,7 +62,9 @@ public unsafe void ToManaged(out bool? value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public void ToJS(bool? value)
         {
             if (value.HasValue)

diff --git a/...ript/src/System/Runtime/InteropServices/JavaScript/Marshaling/JSMarshalerArgument.Byte.cs b/...ript/src/System/Runtime/InteropServices/JavaScript/Marshaling/JSMarshalerArgument.Byte.cs
@@ -12,7 +12,9 @@ public partial struct JSMarshalerArgument
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public unsafe void ToManaged(out byte value)
         {
             if (slot.Type == MarshalerType.None)
@@ -28,7 +30,9 @@ public unsafe void ToManaged(out byte value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public void ToJS(byte value)
         {
             slot.Type = MarshalerType.Byte;
@@ -40,7 +44,9 @@ public void ToJS(byte value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public unsafe void ToManaged(out byte? value)
         {
             if (slot.Type == MarshalerType.None)
@@ -56,7 +62,9 @@ public unsafe void ToManaged(out byte? value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public void ToJS(byte? value)
         {
             if (value.HasValue)

diff --git a/...ript/src/System/Runtime/InteropServices/JavaScript/Marshaling/JSMarshalerArgument.Char.cs b/...ript/src/System/Runtime/InteropServices/JavaScript/Marshaling/JSMarshalerArgument.Char.cs
@@ -12,7 +12,9 @@ public partial struct JSMarshalerArgument
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public unsafe void ToManaged(out char value)
         {
             if (slot.Type == MarshalerType.None)
@@ -28,7 +30,9 @@ public unsafe void ToManaged(out char value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public void ToJS(char value)
         {
             slot.Type = MarshalerType.Char;
@@ -40,7 +44,9 @@ public void ToJS(char value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public unsafe void ToManaged(out char? value)
         {
             if (slot.Type == MarshalerType.None)
@@ -56,7 +62,9 @@ public unsafe void ToManaged(out char? value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public void ToJS(char? value)
         {
             if (value.HasValue)

diff --git a/.../src/System/Runtime/InteropServices/JavaScript/Marshaling/JSMarshalerArgument.DateTime.cs b/.../src/System/Runtime/InteropServices/JavaScript/Marshaling/JSMarshalerArgument.DateTime.cs
@@ -12,7 +12,9 @@ public partial struct JSMarshalerArgument
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public unsafe void ToManaged(out DateTimeOffset value)
         {
             if (slot.Type == MarshalerType.None)
@@ -28,7 +30,9 @@ public unsafe void ToManaged(out DateTimeOffset value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public void ToJS(DateTimeOffset value)
         {
             slot.Type = MarshalerType.DateTimeOffset;
@@ -40,7 +44,9 @@ public void ToJS(DateTimeOffset value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public unsafe void ToManaged(out DateTimeOffset? value)
         {
             if (slot.Type == MarshalerType.None)
@@ -56,7 +62,9 @@ public unsafe void ToManaged(out DateTimeOffset? value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public void ToJS(DateTimeOffset? value)
         {
             if (value.HasValue)
@@ -75,7 +83,9 @@ public void ToJS(DateTimeOffset? value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public unsafe void ToManaged(out DateTime value)
         {
             if (slot.Type == MarshalerType.None)
@@ -91,7 +101,9 @@ public unsafe void ToManaged(out DateTime value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public void ToJS(DateTime value)
         {
             slot.Type = MarshalerType.DateTime;
@@ -103,7 +115,9 @@ public void ToJS(DateTime value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public unsafe void ToManaged(out DateTime? value)
         {
             if (slot.Type == MarshalerType.None)
@@ -119,7 +133,9 @@ public unsafe void ToManaged(out DateTime? value)
         /// It's used by JSImport code generator and should not be used by developers in source code.
         /// </summary>
         /// <param name="value">The value to be marshaled.</param>
+#if !DEBUG
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
+#endif
         public void ToJS(DateTime? value)
         {
             if (value.HasValue)