From 4cb9c0fdab465754db9af06f70394c6819af0bbb Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Wed, 15 Oct 2025 13:17:34 +0200 Subject: [PATCH 1/4] - revert WasmNativeDebugSymbols default to previous true - revert wasm-opt to previous --enable-simd --enable-exception-handling --enable-bulk-memory --- src/mono/wasm/build/WasmApp.Common.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index d9bf8e3b931dae..0b5a8b86848016 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -537,7 +537,7 @@ - false + true true @@ -911,8 +911,8 @@ - - + From 54ae17a6befbf1f1341a3f2e1b53d105d641ad0f Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Wed, 15 Oct 2025 13:29:43 +0200 Subject: [PATCH 2/4] whitespace --- src/mono/wasm/build/WasmApp.Common.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/wasm/build/WasmApp.Common.targets b/src/mono/wasm/build/WasmApp.Common.targets index 0b5a8b86848016..7b21df5f3a12fd 100644 --- a/src/mono/wasm/build/WasmApp.Common.targets +++ b/src/mono/wasm/build/WasmApp.Common.targets @@ -911,7 +911,7 @@ - + From 09ffc38c408e6464df9816d119eaf2b53db74870 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Thu, 16 Oct 2025 09:54:21 +0200 Subject: [PATCH 3/4] revert WBT --- .../NativeRebuildTests/FlagsChangeRebuildTest.cs | 3 --- src/mono/wasm/Wasm.Build.Tests/WasmNativeDefaultsTests.cs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/FlagsChangeRebuildTest.cs b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/FlagsChangeRebuildTest.cs index d8d4cb039497b0..081b8c2053d552 100644 --- a/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/FlagsChangeRebuildTest.cs +++ b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/FlagsChangeRebuildTest.cs @@ -39,9 +39,6 @@ public async Task ExtraEmccFlagsSetButNoRealChange(Configuration config, bool ao if (!dotnetNativeFilesUnchanged) pathsDict.UpdateTo(unchanged: false, "dotnet.native.wasm", "dotnet.native.js"); - if (extraCFlags.Length != 0) - pathsDict.UpdateTo(unchanged: false, "driver.o", "runtime.o", "corebindings.o", "pinvoke.o"); - var originalStat = StatFiles(pathsDict); // Rebuild diff --git a/src/mono/wasm/Wasm.Build.Tests/WasmNativeDefaultsTests.cs b/src/mono/wasm/Wasm.Build.Tests/WasmNativeDefaultsTests.cs index 9c1a4e8c0beddb..247a1180ed2a2e 100644 --- a/src/mono/wasm/Wasm.Build.Tests/WasmNativeDefaultsTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/WasmNativeDefaultsTests.cs @@ -233,7 +233,7 @@ private void InferAndCheckPropertyValues(string? line, bool isPublish, bool wasm } else { - expectedWasmNativeDebugSymbols = false; + expectedWasmNativeDebugSymbols = true; expectedWasmNativeStripValue = true; } From c7152d035587e9c3fd1c28bd5fcf610bce610479 Mon Sep 17 00:00:00 2001 From: pavelsavara Date: Thu, 16 Oct 2025 15:15:50 +0200 Subject: [PATCH 4/4] more --- .../NativeRebuildTests/FlagsChangeRebuildTest.cs | 5 ++--- src/mono/wasm/Wasm.Build.Tests/WasmNativeDefaultsTests.cs | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/FlagsChangeRebuildTest.cs b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/FlagsChangeRebuildTest.cs index 081b8c2053d552..4d34b075949dc1 100644 --- a/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/FlagsChangeRebuildTest.cs +++ b/src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/FlagsChangeRebuildTest.cs @@ -35,7 +35,7 @@ public async Task ExtraEmccFlagsSetButNoRealChange(Configuration config, bool ao ProjectInfo info = CopyTestAsset(config, aot, TestAsset.WasmBasicTestApp, "rebuild_flags"); BuildPaths paths = await FirstNativeBuildAndRun(info, config, aot, requestNativeRelink: true, invariant: false); var pathsDict = GetFilesTable(info.ProjectName, aot, paths, unchanged: true); - bool dotnetNativeFilesUnchanged = extraLDFlags.Length == 0 && extraCFlags.Length == 0; + bool dotnetNativeFilesUnchanged = extraLDFlags.Length == 0; if (!dotnetNativeFilesUnchanged) pathsDict.UpdateTo(unchanged: false, "dotnet.native.wasm", "dotnet.native.js"); @@ -53,9 +53,8 @@ public async Task ExtraEmccFlagsSetButNoRealChange(Configuration config, bool ao // and thus doesn't cause relinking TestUtils.AssertSubstring("pinvoke.c -> pinvoke.o", output, contains: extraCFlags.Length > 0); - // ldflags or cflags: link step args change, so it should trigger relink + // ldflags: link step args change, so it should trigger relink TestUtils.AssertSubstring("Linking with emcc", output, contains: !dotnetNativeFilesUnchanged); - if (aot) { // ExtraEmccLDFlags does not affect .bc files diff --git a/src/mono/wasm/Wasm.Build.Tests/WasmNativeDefaultsTests.cs b/src/mono/wasm/Wasm.Build.Tests/WasmNativeDefaultsTests.cs index 247a1180ed2a2e..22bf394ec2a4c4 100644 --- a/src/mono/wasm/Wasm.Build.Tests/WasmNativeDefaultsTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/WasmNativeDefaultsTests.cs @@ -144,7 +144,7 @@ public void WasmNativeStripDefaultWithBuild(Configuration config, string extraPr CheckPropertyValues(line, wasmBuildNative: expectedWasmBuildNativeValue, wasmNativeStrip: expectedWasmNativeStripValue, - wasmNativeDebugSymbols: config == Configuration.Debug && !expectedWasmNativeStripValue, + wasmNativeDebugSymbols: true, wasmBuildingForNestedPublish: null); } @@ -158,7 +158,7 @@ public void WasmNativeStripDefaultWithPublish(Configuration config, string extra CheckPropertyValues(line, wasmBuildNative: expectedWasmBuildNativeValue, wasmNativeStrip: expectedWasmNativeStripValue, - wasmNativeDebugSymbols: false, + wasmNativeDebugSymbols: true, wasmBuildingForNestedPublish: true); }