Enable Emscripten with MEMORY64

.gitignore

@@ -363,3 +363,7 @@ src/coreclr/System.Private.CoreLib/common
 .dotnet-daily/
 run-stress-*
 test:.cs
+
+src/mono/System.Private.CoreLib/CompatibilitySuppressions.xml
+
+src/mono/mono/offsets/wasm64-unknown-none.h

eng/native/configurecompiler.cmake

@@ -153,6 +153,7 @@ elseif (CLR_CMAKE_HOST_UNIX)
     add_compile_options(-Wno-unused-parameter)
     add_compile_options(-Wno-alloca)
     add_compile_options(-Wno-implicit-int-float-conversion)
+    add_compile_options(-Wno-experimental)    
   endif()
 endif(MSVC)
 

eng/native/init-vs-env.cmd

@@ -58,6 +58,11 @@ if "%VisualStudioVersion%"=="17.0" (
     set __PlatformToolset=v143
     goto :SetVCEnvironment
 )
+if "%VisualStudioVersion%"=="18.0" (
+    set __VSVersion=vs2026
+    set __PlatformToolset=v143
+    goto :SetVCEnvironment
+)
 
 :VSMissing
 echo %__MsgPrefix%Error: Visual Studio 2022 with C++ tools required. ^

src/libraries/Common/src/Interop/Browser/Interop.Runtime.cs

@@ -35,7 +35,7 @@ internal static unsafe partial class Runtime
 
 #if !ENABLE_JS_INTEROP_BY_VALUE
         [MethodImpl(MethodImplOptions.InternalCall)]
-        public static extern nint RegisterGCRoot(void* start, int bytesSize, IntPtr name);
+        public static extern int RegisterGCRoot(void* start, nint bytesSize, IntPtr name);
         [MethodImpl(MethodImplOptions.InternalCall)]
         public static extern void DeregisterGCRoot(nint handle);
 #endif

src/libraries/Common/tests/WasmTestRunner/WasmTestRunner.csproj

@@ -4,6 +4,7 @@
     <Nullable>enable</Nullable>
     <TargetFrameworks>$(NetCoreAppCurrent)-browser;$(NetCoreAppCurrent)-wasi;$(NetCoreAppCurrent)</TargetFrameworks>
   </PropertyGroup>
+
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
     <TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier>
@@ -12,6 +13,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="WasmTestRunner.cs" />
-    <PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="$(MicrosoftDotNetXHarnessTestRunnersXunitVersion)" />
+    <PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="10.0.0-dev" />
   </ItemGroup>
 </Project>

src/libraries/System.Memory/tests/System.Memory.Tests.csproj

@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TestRuntime>true</TestRuntime>
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>    
   </PropertyGroup>
 
   <ItemGroup>

src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems

@@ -21,7 +21,8 @@
     <NotSupportedOnMono Condition="'$(FeatureMono)' == 'true'">.PlatformNotSupported</NotSupportedOnMono>
     <ILLinkSharedDirectory>$(MSBuildThisFileDirectory)ILLink\</ILLinkSharedDirectory>
     <IsBigEndian Condition="'$(Platform)' == 's390x'">true</IsBigEndian>
-    <Is64Bit Condition="'$(Platform)' == 'arm64' or '$(Platform)' == 'x64' or '$(Platform)' == 's390x' or '$(Platform)' == 'loongarch64' or '$(Platform)' == 'ppc64le' or '$(Platform)' == 'riscv64'">true</Is64Bit>
+    <!--<Is64Bit Condition="'$(Platform)' == 'arm64' or '$(Platform)' == 'x64' or '$(Platform)' == 's390x' or '$(Platform)' == 'loongarch64' or '$(Platform)' == 'ppc64le' or '$(Platform)' == 'riscv64'">true</Is64Bit>-->
+    <Is64Bit>true</Is64Bit>
     <UseMinimalGlobalizationData Condition="'$(TargetsBrowser)' == 'true' or '$(TargetsWasi)' == 'true'">true</UseMinimalGlobalizationData>
     <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
   </PropertyGroup>

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

@@ -473,6 +473,7 @@ public static void WriteIntPtr(IntPtr ptr, int ofs, IntPtr val)
 #if TARGET_64BIT
             WriteInt64(ptr, ofs, (long)val);
 #else // 32
+
 #pragma warning disable CA2020 // Prevent from behavioral change
             WriteInt32(ptr, ofs, (int)val);
 #pragma warning restore CA2020

src/libraries/System.Private.CoreLib/src/System/Threading/Lock.NonNativeAot.cs

@@ -47,7 +47,7 @@ internal partial struct ThreadId
 
             public bool IsInitialized => _id != 0;
             public static ThreadId Current_NoInitialize => new ThreadId(t_threadId);
-
+            
             public void InitializeForCurrentThread()
             {
                 Debug.Assert(!IsInitialized);

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

@@ -1,12 +1,16 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+// FIXME: Make this dynamic!
+#define WASM64
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices.JavaScript;
 using System.Runtime.Versioning;
 using System.Threading;
 
+
+
 namespace System.Runtime.InteropServices.JavaScript
 {
     /// <summary>
@@ -19,9 +23,8 @@ namespace System.Runtime.InteropServices.JavaScript
     public partial struct JSMarshalerArgument
     {
         internal JSMarshalerArgumentImpl slot;
-
         // keep in sync with JSMarshalerArgumentOffsets in marshal.ts
-        [StructLayout(LayoutKind.Explicit, Pack = 32, Size = 32)]
+        [StructLayout(LayoutKind.Explicit, Pack = 32, Size = 64)]
         internal struct JSMarshalerArgumentImpl
         {
             [FieldOffset(0)]
@@ -42,36 +45,35 @@ internal struct JSMarshalerArgumentImpl
             internal double DoubleValue;// must be aligned to 8 because of Module.HEAPF64 view alignment
             [FieldOffset(0)]
             internal IntPtr IntPtrValue;
-
-            [FieldOffset(4)]
+            [FieldOffset(8)]
             internal IntPtr JSHandle;
-            [FieldOffset(4)]
+            [FieldOffset(8)]
             internal IntPtr GCHandle;
 
-            [FieldOffset(8)]
+            [FieldOffset(16)]
             internal int Length;
 
             /// <summary>
             /// Discriminators
             /// </summary>
-            [FieldOffset(12)]
+            [FieldOffset(24)]
             internal MarshalerType Type;
-            [FieldOffset(13)]
+            [FieldOffset(25)]
             internal MarshalerType ElementType;
 
-#if FEATURE_WASM_MANAGED_THREADS
-            [FieldOffset(16)]
-            internal IntPtr ContextHandle;
+    #if FEATURE_WASM_MANAGED_THREADS
+                [FieldOffset(32)]
+                internal IntPtr ContextHandle;
 
-            [FieldOffset(20)]
-            internal bool ReceiverShouldFree; // note this is 1 byte
+                [FieldOffset(40)]
+                internal bool ReceiverShouldFree; // note this is 1 byte
 
-            [FieldOffset(24)]
-            internal IntPtr CallerNativeTID;
+                [FieldOffset(48)]
+                internal IntPtr CallerNativeTID;
 
-            [FieldOffset(28)]
-            internal IntPtr SyncDoneSemaphorePtr;
-#endif
+                [FieldOffset(56)]
+                internal IntPtr SyncDoneSemaphorePtr;
+    #endif
         }
 
         /// <summary>

src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Marshaling/JSMarshalerArgument.Object.cs

@@ -41,6 +41,11 @@ public unsafe void ToManaged(out object? value)
                 ToManaged(out double v);
                 value = v;
             }
+            else if (slot.Type == MarshalerType.BigInt64)
+            {
+                ToManagedBig(out long v);
+                value = v;
+            }
             else if (slot.Type == MarshalerType.JSObject)
             {
                 ToManaged(out JSObject? val);
@@ -378,7 +383,7 @@ public unsafe void ToJS(object?[] value)
             JSMarshalerArgument* payload = (JSMarshalerArgument*)Marshal.AllocHGlobal(bytes);
             Unsafe.InitBlock(payload, 0, (uint)bytes);
 #if !ENABLE_JS_INTEROP_BY_VALUE
-            Interop.Runtime.RegisterGCRoot(payload, bytes, IntPtr.Zero);
+            Interop.Runtime.RegisterGCRoot(payload, (nint)bytes, IntPtr.Zero);
 #endif
             for (int i = 0; i < slot.Length; i++)
             {

src/libraries/System.Runtime.InteropServices.JavaScript/src/System/Runtime/InteropServices/JavaScript/Marshaling/JSMarshalerArgument.String.cs

@@ -120,7 +120,7 @@ public unsafe void ToJS(string?[] value)
             JSMarshalerArgument* payload = (JSMarshalerArgument*)Marshal.AllocHGlobal(bytes);
             Unsafe.InitBlock(payload, 0, (uint)bytes);
 #if !ENABLE_JS_INTEROP_BY_VALUE
-            Interop.Runtime.RegisterGCRoot(payload, bytes, IntPtr.Zero);
+            Interop.Runtime.RegisterGCRoot(payload, (nint)bytes, IntPtr.Zero);
 #endif
             for (int i = 0; i < slot.Length; i++)
             {

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System.Runtime.InteropServices.JavaScript.Tests.csproj

@@ -6,7 +6,7 @@
     <TargetFramework>$(NetCoreAppCurrent)-browser</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TestRuntime>true</TestRuntime>
-    <WasmXHarnessArgs>$(WasmXHarnessArgs) --engine-arg=--expose-gc --web-server-use-cop</WasmXHarnessArgs>
+    <WasmXHarnessArgs>$(WasmXHarnessArgs) --engine-arg=--expose-gc --web-server-use-cop</WasmXHarnessArgs>    
     <EnableAggressiveTrimming>true</EnableAggressiveTrimming>
     <PublishTrimmed>true</PublishTrimmed>
     <FeatureWasmManagedThreads Condition="'$(WasmEnableThreads)' == 'true'">true</FeatureWasmManagedThreads>

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/JSImportTest.cs

@@ -17,7 +17,7 @@ public class JSImportTest : JSInteropTestBase, IAsyncLifetime
         [Fact]
         public unsafe void StructSize()
         {
-            Assert.Equal(32, sizeof(JSMarshalerArgument));
+            Assert.Equal(64, sizeof(JSMarshalerArgument));
         }
 
         [Fact]
@@ -665,13 +665,14 @@ public void JsImportSingle(float value)
         [MemberData(nameof(MarshalIntPtrCases))]
         public void JsImportIntPtr(IntPtr value)
         {
+            string expectedType = IntPtr.Size == 4 ? "number" : "bigint";
             JsImportTest(value,
                 JavaScriptTestHelper.store1_IntPtr,
                 JavaScriptTestHelper.retrieve1_IntPtr,
                 JavaScriptTestHelper.echo1_IntPtr,
                 JavaScriptTestHelper.throw1_IntPtr,
                 JavaScriptTestHelper.identity1_IntPtr,
-                "number");
+                expectedType);
         }
 
         #endregion IntPtr
@@ -691,7 +692,8 @@ public unsafe void JsImportVoidPtr(IntPtr xvalue)
             Assert.True(value == res);
 
             var actualJsType = JavaScriptTestHelper.getType1();
-            Assert.Equal("number", actualJsType);
+            string expectedType = IntPtr.Size == 4 ? "number" : "bigint";
+            Assert.Equal(expectedType, actualJsType);
         }
 
         #endregion VoidPtr
@@ -781,13 +783,14 @@ public void JsImportNullableBigInt64(long? value)
         [MemberData(nameof(MarshalNullableIntPtrCases))]
         public void JsImportNullableIntPtr(IntPtr? value)
         {
+            string expectedType = IntPtr.Size == 4 ? "number" : "bigint";
             JsImportTest(value,
                 JavaScriptTestHelper.store1_NullableIntPtr,
                 JavaScriptTestHelper.retrieve1_NullableIntPtr,
                 JavaScriptTestHelper.echo1_NullableIntPtr,
                 JavaScriptTestHelper.throw1_NullableIntPtr,
                 JavaScriptTestHelper.identity1_NullableIntPtr,
-                "number");
+               expectedType);
         }
 
         #endregion NullableIntPtr

src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System/Runtime/InteropServices/JavaScript/JavaScriptTestHelper.cs

@@ -1074,10 +1074,12 @@ public static async Task InitializeAsync()
             }
         }
 
-        public static Task DisposeAsync()
+        public static async Task<Task> DisposeAsync()
         {
             _module?.Dispose();
             _module = null;
+            await Task.Yield();
+            GC.Collect();
             return Task.CompletedTask;
         }
     }

src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.UnitTests/System.Runtime.InteropServices.Tests.csproj

@@ -3,7 +3,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser</TargetFrameworks>
     <TestRuntime>true</TestRuntime>
-    <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
+    <IncludeRemoteExecutor>true</IncludeRemoteExecutor>    
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />

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

@@ -42,7 +42,7 @@ public SafeWaitHandle(System.IntPtr existingHandle, bool ownsHandle) : base (def
     }
 }
 namespace System
-{
+{        
     public partial class AccessViolationException : System.SystemException
     {
         public AccessViolationException() { }

src/mono/CMakeLists.txt

@@ -121,7 +121,6 @@ endif()
 ######################################
 # AOT CROSS COMPILER SUPPORT
 ######################################
-
 if(NOT AOT_TARGET_TRIPLE STREQUAL "")
   set(MONO_CROSS_COMPILE 1)
   if(NOT AOT_OFFSETS_FILE STREQUAL "")
@@ -144,6 +143,9 @@ if(NOT AOT_TARGET_TRIPLE STREQUAL "")
   elseif(AOT_TARGET_TRIPLE STREQUAL "wasm32-unknown-none")
     set(TARGET_SYSTEM_NAME "emscripten")
     set(TARGET_ARCH "wasm")
+  elseif(AOT_TARGET_TRIPLE STREQUAL "wasm64-unknown-none")
+    set(TARGET_SYSTEM_NAME "emscripten")
+    set(TARGET_ARCH "wasm64")
   elseif(AOT_TARGET_TRIPLE STREQUAL "wasm32-unknown-wasip2")
     set(TARGET_SYSTEM_NAME "wasi")
     set(TARGET_ARCH "wasm")
@@ -169,7 +171,6 @@ if(NOT AOT_TARGET_TRIPLE STREQUAL "")
     message(FATAL_ERROR "AOT target '${AOT_TARGET_TRIPLE}' not supported.")
   endif()
 endif()
-
 ######################################
 # HOST OS CHECKS
 ######################################
@@ -403,7 +404,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
   set(HOST_RISCV64 1)
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x")
   set(HOST_S390X 1)
-elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "wasm" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "wasm32")
+elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "wasm" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "wasm32" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "wasm64")
   set(HOST_WASM 1)
 elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
   set(HOST_POWERPC 1)
@@ -416,8 +417,20 @@ endif()
 # TARGET ARCH CHECKS
 ######################################
 
+if (CMAKE_C_FLAGS MATCHES "wasm64")
+    set(USES_MEM64 TRUE)    
+endif()
+
+if (CMAKE_C_FLAGS MATCHES "MEMORY64")
+    set(USES_MEM64 TRUE)
+endif()
+
 if(NOT TARGET_ARCH)
-  set(TARGET_ARCH "${CMAKE_SYSTEM_PROCESSOR}")
+  if (CMAKE_SYSTEM_PROCESSOR STREQUAL "wasm" AND USES_MEM64)
+    set(TARGET_ARCH "wasm64")    
+  else()
+    set(TARGET_ARCH "${CMAKE_SYSTEM_PROCESSOR}")    
+  endif()  
 endif()
 
 # Unify naming
@@ -481,11 +494,16 @@ elseif(TARGET_ARCH STREQUAL "s390x")
   set(MONO_ARCHITECTURE "\"s390x\"")
   set(TARGET_SIZEOF_VOID_P 8)
   set(SIZEOF_REGISTER 8)
-elseif(TARGET_ARCH STREQUAL "wasm" OR TARGET_ARCH STREQUAL "wasm32")
+elseif(TARGET_ARCH STREQUAL "wasm" OR TARGET_ARCH STREQUAL "wasm32")  
   set(TARGET_WASM 1)
   set(MONO_ARCHITECTURE "\"wasm\"")
   set(TARGET_SIZEOF_VOID_P 4)
   set(SIZEOF_REGISTER 4)
+elseif(TARGET_ARCH STREQUAL "wasm64" )  
+  set(TARGET_WASM 1)
+  set(MONO_ARCHITECTURE "\"wasm\"")
+  set(TARGET_SIZEOF_VOID_P 8)  
+  set(SIZEOF_REGISTER 8)
 elseif(TARGET_ARCH STREQUAL "ppc64le")
   set(TARGET_POWERPC 1)
   set(TARGET_POWERPC64 1)
@@ -587,6 +605,8 @@ if(LLVM_PREFIX)
     set(llvm_codegen_libs "armcodegen")
   elseif(TARGET_ARCH STREQUAL "wasm")
     set(llvm_codegen_libs "")
+  elseif(TARGET_ARCH STREQUAL "wasm64")
+    set(llvm_codegen_libs "")
   else()
     message(FATAL_ERROR "FIXME: ${TARGET_ARCH}")
   endif()
@@ -657,7 +677,7 @@ if(LLVM_PREFIX)
 
   # Check codegen libs and add needed libraries.
   set(llvm_extra ${MONO_llvm_extra_libs_${llvm_codegen_libs}})
-  if("${llvm_extra}" STREQUAL "" AND NOT "${TARGET_ARCH}" STREQUAL "wasm")
+  if("${llvm_extra}" STREQUAL "" AND NOT "${TARGET_ARCH}" STREQUAL "wasm" AND NOT "${TARGET_ARCH}" STREQUAL "wasm64" )
     message(FATAL_ERROR "FIXME: ${TARGET_ARCH}")
   endif()
 

src/mono/System.Private.CoreLib/src/Mono/RuntimeHandles.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace Mono
 {
@@ -205,6 +206,7 @@ public override int GetHashCode()
         }
     }
 
+    [StructLayout(LayoutKind.Sequential, Pack = 8)]
     internal unsafe struct RuntimeGPtrArrayHandle
     {
         private RuntimeStructs.GPtrArray* value;