WASM Bindings optimizations and fixes

src/libraries/System.Private.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Runtime.cs

@@ -71,7 +71,16 @@ private static int BindJSObject(int jsId, bool ownsHandle, int mappedType)
             WeakReference? reference;
             lock (_boundObjects)
             {
-                if (!_boundObjects.TryGetValue(jsId, out reference))
+                if (_boundObjects.TryGetValue(jsId, out reference))
+                {
+                    if ((reference.Target == null) || ((reference.Target as JSObject)?.IsDisposed == true))
+                    {
+                        _boundObjects.Remove(jsId);
+                        reference = null;
+                    }
+                }
+
+                if (reference == null)
                 {
                     IntPtr jsIntPtr = (IntPtr)jsId;
                     reference = new WeakReference(mappedType > 0 ? BindJSType(jsIntPtr, ownsHandle, mappedType) : new JSObject(jsIntPtr, ownsHandle), true);
@@ -229,21 +238,6 @@ private static int GetJSObjectId(object rawObj)
                 js.GetWrappedObject() ?? h.Target : h.Target;
         }
 
-        private static object BoxInt(int i)
-        {
-            return i;
-        }
-
-        private static object BoxDouble(double d)
-        {
-            return d;
-        }
-
-        private static object BoxBool(int b)
-        {
-            return b == 0 ? false : true;
-        }
-
         private static bool IsSimpleArray(object a)
         {
             return a is System.Array arr && arr.Rank == 1 && arr.GetLowerBound(0) == 0;

src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/HelperMarshal.cs

@@ -88,6 +88,11 @@ private static object InvokeMarshalObj()
             return _marshalledObject;
         }
 
+        private static object InvokeReturnMarshalObj()
+        {
+            return _marshalledObject;
+        }
+
         internal static int _valOne, _valTwo;
         private static void ManipulateObject(JSObject obj)
         {
@@ -316,20 +321,26 @@ private static void CreateFunctionSum()
         internal static int _sumValue = 0;
         private static void CallFunctionSum()
         {
+            if (_sumFunction == null)
+                throw new Exception("_sumFunction is null");
             _sumValue = (int)_sumFunction.Call(null, 3, 5);
         }
 
         private static Function _mathMinFunction;
         private static void CreateFunctionApply()
         {
             var math = (JSObject)Runtime.GetGlobalObject("Math");
+            if (math == null)
+                throw new Exception("Runtime.GetGlobalObject(Math) returned null");
             _mathMinFunction = (Function)math.GetObjectProperty("min");
 
         }
 
         internal static int _minValue = 0;
         private static void CallFunctionApply()
         {
+            if (_mathMinFunction == null)
+                throw new Exception("_mathMinFunction is null");
             _minValue = (int)_mathMinFunction.Apply(null, new object[] { 5, 6, 2, 3, 7 });
         }
 
@@ -345,5 +356,32 @@ public static void SetBlobAsUri(Uri blobUri)
             _blobURI = blobUri;
         }
 
+        internal static uint _uintValue;
+        private static void InvokeUInt(uint value)
+        {
+            _uintValue = value;
+        }
+
+        internal static TestEnum _enumValue;
+        private static void SetEnumValue(TestEnum value)
+        {
+            _enumValue = value;
+        }
+        private static TestEnum GetEnumValue()
+        {
+            return _enumValue;
+        }
+
+        private static UInt64 GetUInt64()
+        {
+            return UInt64.MaxValue;
+        }
+    }
+
+    public enum TestEnum : uint {
+        FirstValue = 1,
+        Zero = 0,
+        Five = 5,
+        BigValue = 0xFFFFFFFEu
     }
 }

src/libraries/System.Private.Runtime.InteropServices.JavaScript/tests/System/Runtime/InteropServices/JavaScript/JavaScriptTests.cs

@@ -92,14 +92,13 @@ public static void FunctionSum()
         }
 
         [Fact]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/40112")]
         public static void FunctionMath()
         {
             JSObject math = (JSObject)Runtime.GetGlobalObject("Math");
-            Assert.NotNull(math);
+            Assert.True(math != null, "math != null");
 
             Function mathMax = (Function)math.GetObjectProperty("max");
-            Assert.NotNull(mathMax);
+            Assert.True(mathMax != null, "math.max != null");
 
             var maxValue = (int)mathMax.Apply(null, new object[] { 5, 6, 2, 3, 7 });
             Assert.Equal(7, maxValue);
@@ -108,7 +107,7 @@ public static void FunctionMath()
             Assert.Equal(7, maxValue);
 
             Function mathMin = (Function)((JSObject)Runtime.GetGlobalObject("Math")).GetObjectProperty("min");
-            Assert.NotNull(mathMin);
+            Assert.True(mathMin != null, "math.min != null");
 
             var minValue = (int)mathMin.Apply(null, new object[] { 5, 6, 2, 3, 7 });
             Assert.Equal(2, minValue);