Merge main

Author: SwapnilGaikwad

docs/project/list-of-diagnostics.md

@@ -274,7 +274,7 @@ The diagnostic id values reserved for .NET Libraries analyzer warnings are `SYSL
 |  __`SYSLIB1226`__ | 'JsonIgnoreCondition.Always' is not valid on type-level 'JsonIgnoreAttribute' annotations. |
 |  __`SYSLIB1227`__ | Union case types cannot be unambiguously classified by JSON value type. |
 |  __`SYSLIB1228`__ | Union type shape is not a valid C# union. |
-|  __`SYSLIB1229`__ | _`SYSLIB1220`-`SYSLIB1229` reserved for System.Text.Json.SourceGeneration._ |
+|  __`SYSLIB1229`__ | Open generic derived type could not be resolved for the polymorphic base type. |
 |  __`SYSLIB1230`__ | Deriving from a `GeneratedComInterface`-attributed interface defined in another assembly is not supported. |
 |  __`SYSLIB1231`__ | _`SYSLIB1230`-`SYSLIB1239` reserved for Microsoft.Interop.ComInterfaceGenerator._ |
 |  __`SYSLIB1232`__ | _`SYSLIB1230`-`SYSLIB1239` reserved for Microsoft.Interop.ComInterfaceGenerator._ |

eng/AcquireWasiSdk.targets

@@ -7,7 +7,7 @@
 -->
 <Project>
   <PropertyGroup>
-    <_WasiSdkVersion>25.0</_WasiSdkVersion>
+    <_WasiSdkVersion>33.0</_WasiSdkVersion>
     <_RuntimeLocalWasiSdkPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'wasi-sdk'))</_RuntimeLocalWasiSdkPath>    
   </PropertyGroup>
 

eng/Versions.props

@@ -142,7 +142,7 @@
     <Antlr4BuildTasksVersion>12.14.0</Antlr4BuildTasksVersion>
     <Antlr4RuntimeStandardVersion>4.13.1</Antlr4RuntimeStandardVersion>
     <!-- Testing -->
-    <MicrosoftNETCoreCoreDisToolsVersion>1.6.0</MicrosoftNETCoreCoreDisToolsVersion>
+    <MicrosoftNETCoreCoreDisToolsVersion>1.7.0</MicrosoftNETCoreCoreDisToolsVersion>
     <MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
     <MicrosoftOneCollectRecordTraceVersion>0.1.33421</MicrosoftOneCollectRecordTraceVersion>
     <NUnitVersion>3.12.0</NUnitVersion>

eng/native/gen-buildsys.cmd

@@ -70,7 +70,7 @@ if /i "%__Arch%" == "wasm" (
             set "WASI_SDK_PATH=%__repoRoot%\artifacts\wasi-sdk"
         )
         set __CmakeGenerator=Ninja
-        set __ExtraCmakeParams=%__ExtraCmakeParams% -DCLR_CMAKE_TARGET_OS=wasi "-DCMAKE_TOOLCHAIN_FILE=!WASI_SDK_PATH!/share/cmake/wasi-sdk-p2.cmake" "-DCMAKE_CROSSCOMPILING_EMULATOR=node --experimental-wasm-bigint --experimental-wasi-unstable-preview1"
+        set __ExtraCmakeParams=%__ExtraCmakeParams% -DCLR_CMAKE_TARGET_OS=wasi "-DCMAKE_TOOLCHAIN_FILE=!WASI_SDK_PATH!/share/cmake/wasi-sdk-p2.cmake"
     )
 ) else (
     set __ExtraCmakeParams=%__ExtraCmakeParams%  "-DCMAKE_SYSTEM_VERSION=10.0"

eng/native/gen-buildsys.sh

@@ -115,7 +115,7 @@ if [[ "$host_arch" == "wasm" ]]; then
                 exit 1
             fi
         fi
-        cmake_extra_defines_wasm=("-DCLR_CMAKE_TARGET_OS=wasi" "-DCMAKE_TOOLCHAIN_FILE=${WASI_SDK_PATH}/share/cmake/wasi-sdk-p2.cmake" "-DCMAKE_CROSSCOMPILING_EMULATOR=node --experimental-wasm-bigint --experimental-wasi-unstable-preview1")
+        cmake_extra_defines_wasm=("-DCLR_CMAKE_TARGET_OS=wasi" "-DCMAKE_TOOLCHAIN_FILE=${WASI_SDK_PATH}/share/cmake/wasi-sdk-p2.cmake")
     else
         echo "target_os was not specified"
         exit 1

eng/testing/BrowserVersions.props

@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
-    <linux_ChromeVersion>148.0.7778.96</linux_ChromeVersion>
-    <linux_ChromeRevision>1610480</linux_ChromeRevision>
-    <linux_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1610483</linux_ChromeBaseSnapshotUrl>
-    <linux_V8Version>14.8.178</linux_V8Version>
+    <linux_ChromeVersion>149.0.7827.53</linux_ChromeVersion>
+    <linux_ChromeRevision>1625079</linux_ChromeRevision>
+    <linux_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Linux_x64/1625084</linux_ChromeBaseSnapshotUrl>
+    <linux_V8Version>14.9.207</linux_V8Version>
     <macos_ChromeVersion>143.0.7499.40</macos_ChromeVersion>
     <macos_ChromeRevision>1536371</macos_ChromeRevision>
     <macos_ChromeBaseSnapshotUrl>https://storage.googleapis.com/chromium-browser-snapshots/Mac_Arm/1536376</macos_ChromeBaseSnapshotUrl>

eng/testing/tests.wasi.targets

@@ -50,6 +50,7 @@
     <_XHarnessArgs                                                 >$(_XHarnessArgs) --engine-arg=--wasi --engine-arg=tcp</_XHarnessArgs>
     <_XHarnessArgs                                                 >$(_XHarnessArgs) --engine-arg=--wasi --engine-arg=udp</_XHarnessArgs>
     <_XHarnessArgs                                                 >$(_XHarnessArgs) --engine-arg=--wasi --engine-arg=allow-ip-name-lookup</_XHarnessArgs>
+    <_XHarnessArgs                                                 >$(_XHarnessArgs) --engine-arg=--wasi --engine-arg=hostcall-fuel=4294967295</_XHarnessArgs>
     <_XHarnessArgs                                                 >$(_XHarnessArgs) --engine-arg=--env --engine-arg=DOTNET_WASI_PRINT_EXIT_CODE=1</_XHarnessArgs>
     <_XHarnessArgs Condition="'$(WasmXHarnessArgsCli)' != ''"      >$(_XHarnessArgs) $(WasmXHarnessArgsCli)</_XHarnessArgs>
 
@@ -87,6 +88,13 @@
   <PropertyGroup Condition="'$(BuildAOTTestsOnHelix)' != 'true'">
     <WasmBuildOnlyAfterPublish>true</WasmBuildOnlyAfterPublish>
 
+    <!-- Test projects are libraries (OutputType=Library), for which WasmGenerateAppBundle defaults to false.
+         Unlike browser (where the WebAssembly SDK bundles via static web assets), wasi has no such SDK, so the
+         in-tree WasiAppBuilder must run to populate the AppBundle. Force it on for local wasi test builds.
+         Set unconditionally: WasmApp.Common.targets is imported earlier and already defaulted this to 'false',
+         so a '== ''' guard would not take effect. A '/p:' override remains a global property and still wins. -->
+    <WasmGenerateAppBundle>true</WasmGenerateAppBundle>
+
     <!-- wasm's publish targets will trigger publish, so we shouldn't do that -->
     <PublishTestAsSelfContainedDependsOn />
     <WasmNestedPublishAppDependsOn>PrepareForWasiBuildApp;$(WasmNestedPublishAppDependsOn)</WasmNestedPublishAppDependsOn>

src/coreclr/debug/daccess/dacdbiimpl.cpp

@@ -6052,7 +6052,8 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetThreadOwningMonitorLock(VMPTR_
 
         DWORD threadId = 0;
         DWORD recursionCount = 0;
-        BOOL isLockHeld = pObj->GetHeader()->PassiveGetSyncBlock()->TryGetLockInfo(&threadId, &recursionCount);
+        SyncBlock* psb = pObj->GetHeader()->PassiveGetSyncBlock();
+        BOOL isLockHeld = psb != NULL && psb->TryGetLockInfo(&threadId, &recursionCount);
 
         if (!isLockHeld)
         {

src/coreclr/dlls/mscoree/exports.cpp

@@ -262,7 +262,7 @@ int coreclr_initialize(
         &hostContract);
 
 #ifdef TARGET_UNIX
-    DWORD error = PAL_InitializeCoreCLR(exePath, g_coreclr_embedded);
+    DWORD error = PAL_InitializeCoreCLR(g_coreclr_embedded);
     hr = HRESULT_FROM_WIN32(error);
 
     // If PAL initialization failed, then we should return right away and avoid

src/coreclr/inc/coredistools.h

@@ -43,6 +43,7 @@ enum TargetArch {
     Target_Arm64,
     Target_LoongArch64,
     Target_RiscV64,
+    Target_Wasm32,
 };
 
 struct CorDisasm;
@@ -191,6 +192,44 @@ typedef void __cdecl DumpDiffBlocks_t(const CorAsmDiff *AsmDiff,
     const uint8_t *Bytes2, size_t Size2);
 DllIface DumpDiffBlocks_t DumpDiffBlocks;
 
+// "Framed" variants -- intended for Target_Wasm32 today, where the JIT writes
+// the code buffer as a sequence of length-prefixed Wasm function/funclet
+// bodies rather than a flat instruction stream.
+//
+// Layout of each record:
+//   [ULEB128 body_size_in_bytes][body bytes]
+//
+// Each body begins with the standard Wasm locals declaration
+//   [ULEB128 num_local_decls][(ULEB128 count, u8 valtype)*]
+// followed by the opcode stream (which is expected to end with the outer
+// function's `end` opcode 0x0B).
+//
+// The OffsetComparator callback is invoked with BlockOffset set to the byte
+// offset of the current instruction's *opcode byte*, measured from the start
+// of the whole framed buffer (Bytes). This matches the offsets used by the
+// JIT-recorded relocation tables, so callers can look up reloc kind / target
+// directly without further bookkeeping.
+//
+// The non-framed entry points (NearDiffCodeBlocks, DumpCodeBlock,
+// DumpDiffBlocks) automatically delegate to these framed implementations
+// when the configured target architecture is Target_Wasm32.
+typedef bool __cdecl NearDiffCodeBlocksFramed_t(const CorAsmDiff *AsmDiff,
+    const void *UserData,
+    const uint8_t *Address1,
+    const uint8_t *Bytes1, size_t Size1,
+    const uint8_t *Address2,
+    const uint8_t *Bytes2, size_t Size2);
+DllIface NearDiffCodeBlocksFramed_t NearDiffCodeBlocksFramed;
+
+typedef void __cdecl DumpCodeBlockFramed_t(const CorDisasm *Disasm,
+    const uint8_t *Address, const uint8_t *Bytes, size_t Size);
+DllIface DumpCodeBlockFramed_t DumpCodeBlockFramed;
+
+typedef void __cdecl DumpDiffBlocksFramed_t(const CorAsmDiff *AsmDiff,
+    const uint8_t *Address1, const uint8_t *Bytes1, size_t Size1,
+    const uint8_t *Address2, const uint8_t *Bytes2, size_t Size2);
+DllIface DumpDiffBlocksFramed_t DumpDiffBlocksFramed;
+
 // Get a pointer to the buffered output buffer.
 typedef const char* __cdecl GetOutputBuffer_t();
 DllIface GetOutputBuffer_t GetOutputBuffer;