Don't use SyncTextWriter on WASI either (#104798)

Follow-up to #101221 so we match behavior between single-threaded Browser and WASI.
dotnet · Jul 15, 2024 · 9bc738d · 9bc738d
1 parent 5130683
commit 9bc738d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 11 deletions.
diff --git a/src/libraries/System.Console/tests/ReadAndWrite.cs b/src/libraries/System.Console/tests/ReadAndWrite.cs
@@ -158,9 +158,11 @@ public static async Task OutWriteAndWriteLineOverloads()
                 Console.SetOut(sw);
                 TextWriter writer = Console.Out;
                 Assert.NotNull(writer);
-                // Browser bypasses SyncTextWriter for faster startup
-                if (!OperatingSystem.IsBrowser())
+                // single-threaded WASM bypasses SyncTextWriter for faster startup
+                if (PlatformDetection.IsThreadingSupported)
                     Assert.NotEqual(writer, sw); // the writer we provide gets wrapped
+                else
+                    Assert.Equal(writer, sw); // the writer we provide does not get wrapped
 
                 // We just want to ensure none of these throw exceptions, we don't actually validate
                 // what was written.

diff --git a/src/libraries/System.Console/tests/SyncTextWriter.cs b/src/libraries/System.Console/tests/SyncTextWriter.cs
@@ -12,7 +12,7 @@
 
 public class SyncTextWriter
 {
-    // Browser bypasses SyncTextWriter for faster startup
+    // single-threaded WASM bypasses SyncTextWriter for faster startup
     [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
     public void SyncTextWriterLockedOnThis()
     {

diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
@@ -22,8 +22,6 @@
     <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>
     <UseMinimalGlobalizationData Condition="'$(TargetsBrowser)' == 'true' or '$(TargetsWasi)' == 'true'">true</UseMinimalGlobalizationData>
-    <FeatureWasmManagedThreads Condition="'$(WasmEnableThreads)' == 'true'">true</FeatureWasmManagedThreads>
-    <DefineConstants Condition="'$(FeatureWasmManagedThreads)' == 'true'">$(DefineConstants);FEATURE_WASM_MANAGED_THREADS</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
     <DefineConstants Condition="'$(IsBigEndian)' == 'true'">$(DefineConstants);BIGENDIAN</DefineConstants>

diff --git a/src/libraries/System.Private.CoreLib/src/System/IO/TextWriter.cs b/src/libraries/System.Private.CoreLib/src/System/IO/TextWriter.cs
@@ -759,7 +759,7 @@ public static TextWriter Synchronized(TextWriter writer)
         {
             ArgumentNullException.ThrowIfNull(writer);
 
-#if !TARGET_BROWSER || FEATURE_WASM_MANAGED_THREADS
+#if (!TARGET_BROWSER && !TARGET_WASI) || FEATURE_WASM_MANAGED_THREADS
             return writer is SyncTextWriter ? writer : new SyncTextWriter(writer);
 #else
             return writer;

diff --git a/src/libraries/System.Runtime/tests/System.IO.Tests/StreamReader/StreamReader.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamReader/StreamReader.cs
@@ -29,7 +29,7 @@ public void ObjectClosedReadLineBaseStream()
             Assert.Throws<ObjectDisposedException>(() => sr.ReadLine());
         }
 
-        // Browser bypasses SyncTextWriter for faster startup
+        // single-threaded WASM bypasses SyncTextWriter for faster startup
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
         public void Synchronized_NewObject()
         {

diff --git a/src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/StreamWriter/StreamWriter.cs
@@ -7,7 +7,7 @@ namespace System.IO.Tests
 {
     public partial class WriteTests
     {
-        // Browser bypasses SyncTextWriter for faster startup
+        // single-threaded WASM bypasses SyncTextWriter for faster startup
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
         public void Synchronized_NewObject()
         {

diff --git a/src/libraries/System.Runtime/tests/System.IO.Tests/TextWriter/TextWriterTests.cs b/src/libraries/System.Runtime/tests/System.IO.Tests/TextWriter/TextWriterTests.cs
@@ -690,7 +690,7 @@ public void DisposeAsync_ExceptionReturnedInTask()
             Assert.Same(e, vt.AsTask().Exception.InnerException);
         }
 
-        // Browser bypasses SyncTextWriter for faster startup
+        // single-threaded WASM bypasses SyncTextWriter for faster startup
         [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))]
         public async Task FlushAsync_Precanceled()
         {

diff --git a/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -13,8 +13,6 @@
     <Platforms>x64;x86;arm;armv6;arm64;riscv64;s390x;wasm;ppc64le</Platforms>
 
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
-    <FeatureWasmManagedThreads Condition="'$(WasmEnableThreads)' == 'true'">true</FeatureWasmManagedThreads>
-    <DefineConstants Condition="'$(FeatureWasmManagedThreads)' == 'true'">$(DefineConstants);FEATURE_WASM_MANAGED_THREADS</DefineConstants>
   </PropertyGroup>
 
   <!-- Note that various places in SPCL depend on this resource name i.e. TplEventSource -->