[NativeAOT-LLVM] support System.Net.Http.HttpClient on WASIp2

eng/pipelines/common/global-build-job.yml

@@ -232,6 +232,8 @@ jobs:
         displayName: Install wasi-sdk
       - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-wasmtime.ps1 -CI -InstallDir $(Build.SourcesDirectory)/wasm-tools
         displayName: Install wasmtime
+      - script: pwsh $(Build.SourcesDirectory)/eng/pipelines/runtimelab/install-jco.ps1 $(Build.SourcesDirectory)
+        displayName: Install Jco
 
     - ${{ if or(eq(parameters.platform, 'browser_wasm_win'), and(eq(parameters.platform, 'wasi_wasm_win'), not(eq(parameters.runtimeFlavor, 'coreclr')))) }}:
       # Update machine certs

eng/pipelines/runtimelab/install-jco.ps1

@@ -0,0 +1,9 @@
+$RootPath = $Args[0]
+
+$NpmExePath = $Env:NPM_EXECUTABLE
+
+Set-Location -Path $RootPath
+
+& $NpmExePath install @bytecodealliance/jco
+& $NpmExePath install @bytecodealliance/preview2-shim
+

eng/pipelines/runtimelab/install-nodejs.ps1

@@ -51,11 +51,13 @@ if ($IsWindows)
 {
     Expand-Archive -LiteralPath "$InstallPath\$NodeJSZipName" -DestinationPath $InstallPath -Force
     $NodeJSExePath = "$InstallPath\$NodeJSInstallName\node.exe"
+    $NpmExePath = "$InstallPath\$NodeJSInstallName\npm.cmd"
 }
 else
 {
     tar xJf $InstallPath/$NodeJSZipName -C $InstallPath
     $NodeJSExePath = "$InstallPath/$NodeJSInstallName/bin/node"
+    $NpmExePath = "$InstallPath/$NodeJSInstallName/bin/npm"
 }
 
 if (!(Test-Path $NodeJSExePath))
@@ -64,5 +66,14 @@ if (!(Test-Path $NodeJSExePath))
     exit 1
 }
 
+if (!(Test-Path $NpmExePath))
+{
+    Write-Error "Did not find NPM at: '$NpmExePath'"
+    exit 1
+}
+
 Write-Host Setting NODEJS_EXECUTABLE to $NodeJSExePath
 Write-Host "##vso[task.setvariable variable=NODEJS_EXECUTABLE]$NodeJSExePath"
+
+Write-Host Setting NPM_EXECUTABLE to $NpmExePath
+Write-Host "##vso[task.setvariable variable=NPM_EXECUTABLE]$NpmExePath"

eng/testing/FindWasmHostExecutable.sh

@@ -6,7 +6,6 @@ exename=$(basename "$exename" .js)
 dirname=$(dirname "$1")
 
 node="node --stack_trace_limit=100"
-WASM_HOST_ARGS_SEPERATOR=""
 
 if [ -e "${dirname}/${exename}.js" ]; then
   WASM_HOST_EXECUTABLE=$node
@@ -21,7 +20,9 @@ elif [ -e "${dirname}/main.mjs" ]; then
   WASM_HOST_EXECUTABLE=$node
   WASM_BINARY_TO_EXECUTE="${dirname}/main.mjs"
 elif [ -e "${dirname}/${exename}.wasm" ]; then
-  WASM_HOST_EXECUTABLE=$WASMTIME_EXECUTABLE
-  WASM_HOST_ARGS_SEPERATOR="--"
+  if [ -z "$WASMTIME_EXECUTABLE" ]; then
+    WASMTIME_EXECUTABLE=wasmtime
+  fi
+  WASM_HOST_EXECUTABLE="$WASMTIME_EXECUTABLE run -S http"
   WASM_BINARY_TO_EXECUTE="${dirname}/${exename}.wasm"
 fi

eng/testing/FindWasmHostExecutableAndRun.sh

@@ -6,8 +6,8 @@ source $SCRIPT_DIR/FindWasmHostExecutable.sh "$1"
 
 if [ -n "${WASM_HOST_EXECUTABLE}" ]; then
   shift
-  echo $WASM_HOST_EXECUTABLE "$WASM_BINARY_TO_EXECUTE" $WASM_HOST_ARGS_SEPERATOR "$@"
-  $WASM_HOST_EXECUTABLE "$WASM_BINARY_TO_EXECUTE" $WASM_HOST_ARGS_SEPERATOR "$@"
+  echo $WASM_HOST_EXECUTABLE "$WASM_BINARY_TO_EXECUTE" "$@"
+  $WASM_HOST_EXECUTABLE "$WASM_BINARY_TO_EXECUTE" "$@"
 else
   echo WASM_HOST_EXECUTABLE not set.
   exit 1

src/coreclr/build-runtime.cmd

@@ -349,9 +349,11 @@ for /f "delims=" %%a in ("-%__RequestedBuildComponents%-") do (
         set __CMakeTarget=!__CMakeTarget! nativeaot
 
         if "%__TargetArch%"=="wasm" (
-            if not defined EMSDK (
-                echo %__ErrMsgPrefix%%__MsgPrefix%Error: The EMSDK environment variable pointing to emsdk root must be set.
-                goto ExitWithError
+            if "%__TargetOS%"=="browser" (
+                if not defined EMSDK (
+                    echo %__ErrMsgPrefix%%__MsgPrefix%Error: The EMSDK environment variable pointing to emsdk root must be set.
+                    goto ExitWithError
+                )
             )
         )
     )

src/coreclr/jit/compiler.cpp

@@ -9686,7 +9686,7 @@ void dumpConvertedVarSet(Compiler* comp, VARSET_VALARG_TP vars)
             {
                 printf(" ");
             }
-            printf("V%02u", varNum);
+            printf("V%02u", (unsigned int) varNum);
             first = false;
         }
     }

src/coreclr/jit/llvmlssa.cpp

@@ -1639,6 +1639,7 @@ class ShadowStackAllocator
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wformat-security"
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif // __clang__
             if (pBuffer == nullptr)
             {

src/coreclr/nativeaot/Runtime/Portable/CMakeLists.txt

@@ -40,4 +40,3 @@ install_static_library(standalonegc-disabled aotsdk nativeaot)
 if (NOT CLR_CMAKE_TARGET_ARCH_WASM)
   install_static_library(standalonegc-enabled aotsdk nativeaot)
 endif()
-

src/libraries/Microsoft.Extensions.FileProviders.Physical/src/PhysicalFileProvider.cs

@@ -163,8 +163,8 @@ internal PhysicalFilesWatcher CreateFileWatcher()
 
             FileSystemWatcher? watcher;
 #if NET
-            //  For browser/iOS/tvOS we will proactively fallback to polling since FileSystemWatcher is not supported.
-            if (OperatingSystem.IsBrowser() || (OperatingSystem.IsIOS() && !OperatingSystem.IsMacCatalyst()) || OperatingSystem.IsTvOS())
+            //  For WASI/browser/iOS/tvOS we will proactively fallback to polling since FileSystemWatcher is not supported.
+            if (OperatingSystem.IsWasi() || OperatingSystem.IsBrowser() || (OperatingSystem.IsIOS() && !OperatingSystem.IsMacCatalyst()) || OperatingSystem.IsTvOS())
             {
                 UsePollingFileWatcher = true;
                 UseActivePolling = true;

src/libraries/Microsoft.Extensions.Hosting/src/Internal/ConsoleLifetime.netcoreapp.cs

@@ -15,10 +15,13 @@ public partial class ConsoleLifetime : IHostLifetime
 
         private partial void RegisterShutdownHandlers()
         {
-            Action<PosixSignalContext> handler = HandlePosixSignal;
-            _sigIntRegistration = PosixSignalRegistration.Create(PosixSignal.SIGINT, handler);
-            _sigQuitRegistration = PosixSignalRegistration.Create(PosixSignal.SIGQUIT, handler);
-            _sigTermRegistration = PosixSignalRegistration.Create(PosixSignal.SIGTERM, handler);
+            if (!OperatingSystem.IsWasi())
+            {
+                Action<PosixSignalContext> handler = HandlePosixSignal;
+                _sigIntRegistration = PosixSignalRegistration.Create(PosixSignal.SIGINT, handler);
+                _sigQuitRegistration = PosixSignalRegistration.Create(PosixSignal.SIGQUIT, handler);
+                _sigTermRegistration = PosixSignalRegistration.Create(PosixSignal.SIGTERM, handler);
+            }
         }
 
         private void HandlePosixSignal(PosixSignalContext context)
@@ -31,9 +34,12 @@ private void HandlePosixSignal(PosixSignalContext context)
 
         private partial void UnregisterShutdownHandlers()
         {
-            _sigIntRegistration?.Dispose();
-            _sigQuitRegistration?.Dispose();
-            _sigTermRegistration?.Dispose();
+            if (!OperatingSystem.IsWasi())
+            {
+                _sigIntRegistration?.Dispose();
+                _sigQuitRegistration?.Dispose();
+                _sigTermRegistration?.Dispose();
+            }
         }
     }
 }

src/libraries/System.Net.Http/src/System.Net.Http.csproj

@@ -24,7 +24,6 @@
     <EmitCompilerGeneratedFiles Condition="'$(Configuration)' == 'Debug' and '$(TargetPlatformIdentifier)' == 'browser'">true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
 
-  <!-- TODO-LLVM: This is not upstreamable because it makes the build runtime-specific. -->
   <PropertyGroup>
     <DefineConstants Condition="'$(RuntimeFlavor)' == 'CoreCLR'">$(DefineConstants);NATIVE_AOT</DefineConstants>
   </PropertyGroup>
@@ -461,10 +460,12 @@
              Link="Common\System\Net\Http\HttpHandlerDefaults.cs" />
   </ItemGroup>
 
-  <!-- TODO-LLVM: This is not upstreamable because it makes the build runtime-specific. -->
-  <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'wasi' and '$(RuntimeFlavor)' != 'CoreCLR'">
+  <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'wasi'">
     <Reference Include="System.Threading.Thread" />
     <Compile Include="System\Net\Http\WasiHttpHandler\WasiHttpHandler.cs" />
+    <Compile Include="System\Net\Http\WasiHttpHandler\WasiHttpInterop.cs" />
+    <Compile Include="System\Net\Http\WasiHttpHandler\WasiOutputStream.cs" />
+    <Compile Include="System\Net\Http\WasiHttpHandler\WasiInputStream.cs" />
     <Compile Include="System\Net\Http\WasiHttpHandler\WasiHttp.cs" />
     <Compile Include="System\Net\Http\WasiHttpHandler\WasiHttpWorld.wit.imports.wasi.clocks.v0_2_1.MonotonicClockInterop.cs" />
     <Compile Include="System\Net\Http\WasiHttpHandler\WasiHttpWorld.wit.imports.wasi.http.v0_2_1.ITypes.cs" />
@@ -481,7 +482,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.Win32.Primitives" />
     <Reference Include="System.Collections.NonGeneric" />
-    <Reference Include="System.Console" Condition="'$(Configuration)' == 'Debug'" />
+    <Reference Include="System.Console" />
     <Reference Include="System.Diagnostics.DiagnosticSource" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Net.NameResolution" />

src/libraries/System.Net.Http/src/System/Net/Http/HttpClientHandler.cs

@@ -11,7 +11,7 @@
 using System.Threading.Tasks;
 using System.Diagnostics.Metrics;
 // TODO-LLVM: This is not upstreamable and should be deleted when https://github.com/dotnet/runtimelab/pull/2614 is merged
-#if TARGET_WASI && !NATIVE_AOT
+#if TARGET_WASI
 using System.Diagnostics;
 using System.Net.Http.Metrics;
 using HttpHandlerType = System.Net.Http.WasiHttpHandler;
@@ -29,8 +29,7 @@ public partial class HttpClientHandler : HttpMessageHandler
     {
         private readonly HttpHandlerType _underlyingHandler;
 
-// TODO-LLVM: This is not upstreamable and !NATIVE_AOT should be reverted when https://github.com/dotnet/runtimelab/pull/2614 is merged
-#if TARGET_BROWSER || (TARGET_WASI && !NATIVE_AOT)
+#if TARGET_BROWSER || TARGET_WASI
         private IMeterFactory? _meterFactory;
         private HttpMessageHandler? _firstHandler; // DiagnosticsHandler or MetricsHandler, depending on global configuration.
 
@@ -100,8 +99,7 @@ protected override void Dispose(bool disposing)
         [CLSCompliant(false)]
         public IMeterFactory? MeterFactory
         {
-// TODO-LLVM: This is not upstreamable and !NATIVE_AOT should be reverted when https://github.com/dotnet/runtimelab/pull/2614 is merged
-#if TARGET_BROWSER || (TARGET_WASI && !NATIVE_AOT)
+#if TARGET_BROWSER || TARGET_WASI
             get => _meterFactory;
             set
             {

src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/SocketsHttpHandler.cs

@@ -36,7 +36,7 @@ private void CheckDisposedOrStarted()
         /// Gets a value that indicates whether the handler is supported on the current platform.
         /// </summary>
         [UnsupportedOSPlatformGuard("browser")]
-        public static bool IsSupported => !OperatingSystem.IsBrowser();
+        public static bool IsSupported => !(OperatingSystem.IsBrowser() || OperatingSystem.IsWasi());
 
         public bool UseCookies
         {

src/libraries/System.Net.Http/src/System/Net/Http/WasiHttpHandler/WasiHttp.cs

@@ -1,4 +1,4 @@
-// Generated by `wit-bindgen` 0.29.0. DO NOT EDIT!
+// Generated by `wit-bindgen` 0.30.0. DO NOT EDIT!
 // <auto-generated />
 #nullable enable
 using System;