[wasm][R2R] Map state machine MoveNext method ids to virtual IPs by lewing · Pull Request #134754 · dotnet/runtime

lewing · 2026-09-27T21:25:41Z

Summary

State-machine (V1) async profiler callstack frames identify methods by AsyncStateMachineDiagnostics<T>.MethodId, which comes from RuntimeMethodHandle_GetNativeCode on MoveNext. On Wasm ReadyToRun, a method's entry point is a PortableEntryPoint whose actual code is a function-table index. EECodeInfo can't resolve that index, so StackFrame.GetMethodFromNativeIP returned nothing and the frame names were lost.

EventPipe method events already mapped these entry points to the synthetic virtual IP registered through ExecutionManager::AddVirtualIPRange (#134026). This PR moves that mapping into a shared GetDiagnosticCodeStartFromEntryPoint helper in precode.cpp, used by both EventPipe and RuntimeMethodHandle_GetNativeCode. The only managed caller of that QCall is AsyncStateMachineDiagnostics.

The mapping is gated on both TARGET_WASM and FEATURE_PORTABLE_ENTRYPOINTS. Treating the actual code as a function-table index is a Wasm fact, and GetWasmVirtualIPFromFunctionTableIndex is declared only under TARGET_WASM. Other portable-entrypoint targets would store a real code address that EECodeInfo already resolves.
PortableEntryPoint::GetActualCode goes from STANDARD_VM_CONTRACT to LIMITED_METHOD_CONTRACT. It only reads a field, and its callers include this NOTHROW/GC_NOTRIGGER helper and the cooperative-mode interpreter. That matches its siblings HasNativeEntryPoint and SetActualCode.
The three ActiveIssue annotations for [wasm][R2R] StateMachineAsync profiler callstack identities do not resolve #134145 are removed.

Validation

Browser CoreCLR, Release, TestWasmReadyToRun=true, EnableAggressiveTrimming=true, Chrome:

The three re-enabled StateMachineAsync_*_ChainEventsAndCallstack tests: 3/3 pass. With only the runtimehandles.cpp change reverted and the runtime rebuilt: 0/3.
Whole AsyncProfilerTests class: 136 run, 61 passed, 0 failed, 75 skipped by existing platform conditions.

Not validated: a Debug/Checked browser build, where contracts are enforced. Non-Wasm builds compile the new mapping out.

Follow-up

The cDAC has the same gap for SOS native code addresses on portable-entrypoint targets: #134753.

Resolves #134145

Note

This pull request description was generated with GitHub Copilot.

RuntimeMethodHandle_GetNativeCode returned the portable entry point for Wasm R2R methods, which holds a function-table index that EECodeInfo cannot resolve. Share the EventPipe mapping to the synthetic virtual IP via a new GetDiagnosticCodeStartFromEntryPoint helper, and re-enable the V1 async profiler callstack tests. Fixes #134145 Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

GetActualCode only reads a field, but declared STANDARD_VM_CONTRACT (THROWS/GC_TRIGGERS/MODE_PREEMPTIVE). Its callers include the NOTHROW/GC_NOTRIGGER GetDiagnosticCodeStartFromEntryPoint and the cooperative-mode interpreter, so use LIMITED_METHOD_CONTRACT to match HasNativeEntryPoint and SetActualCode. Also drop a redundant null check. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

azure-pipelines · 2026-09-27T21:26:22Z

Azure Pipelines: Successfully started running 3 pipeline(s). 13 pipeline(s) were filtered out due to trigger conditions. There may be pipelines that require an authorized user to comment /azp run to run.

dotnet-policy-service · 2026-09-27T21:26:46Z

Tagging subscribers to this area: @agocke
See info in area-owners.md if you want to be subscribed.

dotnet-policy-service · 2026-09-27T21:31:20Z

Tagging subscribers to 'arch-wasm': @lewing, @pavelsavara
See info in area-owners.md if you want to be subscribed.

Copilot

Copilot review overview

🔵 Needs a closer look

The changes affect CoreCLR runtime, Wasm ReadyToRun diagnostics, and contract-sensitive paths requiring final human review.

Review effort: Lite
Findings: None

What changed in this PR

Maps Wasm ReadyToRun portable entry points to diagnostic virtual IPs, restoring async profiler frame resolution.

Changes:

Shares diagnostic mapping between EventPipe and runtime method handles.
Adjusts portable entry-point contract usage.
Re-enables three Wasm ReadyToRun profiler tests.

File	Description
`src/libraries/System.Runtime/tests/System.Threading.Tasks.Tests/System.Runtime.CompilerServices/AsyncProfilerV1Tests.cs`	Removes obsolete issue suppressions.
`src/coreclr/vm/runtimehandles.cpp`	Applies diagnostic address mapping.
`src/coreclr/vm/precode.h`	Declares the shared helper.
`src/coreclr/vm/precode.cpp`	Implements Wasm virtual-IP mapping.
`src/coreclr/vm/precode_portable.cpp`	Relaxes the accessor contract.
`src/coreclr/vm/eventtrace.cpp`	Reuses the shared mapping helper.

lewing · 2026-09-28T19:39:48Z

cc @dotnet/wasm-contrib

davidwrighton

This change looks like it would work correctly, but leaves a bad name in the BCL. Please fix the naming of the functions which have now changed in meaning with this PR.

The value returned is only meaningful for diagnostic reporting (on Wasm it may be interpreter bytecode or a synthetic virtual IP), so name it accordingly. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

The Mono fallback in AsyncProfilerTests looks up the wrapper by name via reflection. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

…rtual IPs (#134756) > [!IMPORTANT] > Stacked on #134754 (targets its branch). Only the commits above #134754's head belong to this PR; retarget to `main` once #134754 merges. ## Problem On `FEATURE_PORTABLE_ENTRYPOINTS` targets (WebAssembly), a method's entry point slot holds a `PortableEntryPoint` address. Native maps it before handing it to diagnostics (`GetInterpreterCodeFromEntryPointIfPresent` / `GetDiagnosticCodeStartFromEntryPoint` in `precode.cpp`), but the cDAC returned the raw address. SOS values such as `DacpMethodDescData.NativeCodeAddr` and rejit `NativeCodeAddr`, plus the DBI/`ClrDataMethodInstance` paths, therefore reported an address that doesn't resolve through `ExecutionManager` for both interpreted and R2R methods. ## Change Adds `IExecutionManager.GetDiagnosticCodeStartFromEntryPoint`, which mirrors the native `GetDiagnosticCodeStartFromEntryPoint`: - **Without portable entrypoints:** delegates to `PrecodeStubs.GetInterpreterCodeFromInterpreterPrecodeIfPresent`. Behavior is unchanged. - **With portable entrypoints:** 1. Returns the address unchanged if it lies in a code range. This is the native `FindCodeRange` check and includes Wasm R2R virtual-IP ranges from #133917. 2. Maps interpreted methods to `MethodDesc::m_interpreterCode`. 3. Maps native R2R methods from the function-table index in `PortableEntryPoint._pActualCode` to the synthetic virtual IP, stepping back past funclet entries. This matches `ExecutionManager::GetWasmVirtualIPFromFunctionTableIndex`. As in native code, it applies only to the method's own (temporary) entry point, and only when the entry point doesn't prefer the interpreter. The mapping lives in ExecutionManager rather than PrecodeStubs because ExecutionManager owns the virtual-IP ranges and R2R lookup. ExecutionManager already depends on PrecodeStubs, so this adds no contract cycle. Function-table-index resolution moves into `ExecutionManagerHelpers.WasmFunctionTableIndexLookup`, which now bounds the list walk and detects cycles, like the virtual-IP list walk. The stack walk's `WasmR2RInfo` becomes a thin wrapper over it. The Legacy SOS/DBI callers (`SOSDacImpl`, `ClrDataMethodInstance`, `DacDbiImpl`) now call the new API. `DacDbiImpl.EnumerateAsyncLocals` also maps its code address before querying async debug info. The native DAC's `EnumerateAsyncLocals` gets the matching `GetInterpreterCodeFromEntryPointIfPresent` mapping (as `GetMethodVarInfo` already does), so the debug-build cDAC/DAC cross-check stays consistent. ### Data descriptors - `PortableEntryPoint.ActualCode` and `PortableEntryPoint.Flags` (only under `FEATURE_PORTABLE_ENTRYPOINTS`). - `MethodDesc.InterpreterCode` (only under `FEATURE_INTERPRETER`). - The contract relies on `kPrefersInterpreterEntryPoint` and `INTERPRETER_CODE_POISON`; the native side now has `[cDAC]` comments marking that dependency. ### Interaction with #133890 #133890 adds `TryGetFunctionIdentity` and `TryIsFunclet` to `WasmR2RInfo`. Whichever PR lands second should add those two methods to `WasmFunctionTableIndexLookup` and have `WasmR2RInfo` forward to them. The `FunctionTableIndexRange*` descriptor meanings here already use #133890's exact wording, so that JSON should merge cleanly. ## Validation - cDAC: `./build.sh -s tools.cdac+tools.cdactests -c Debug -test` passes: 3196 unit tests (17 new), usage tests (contract cycles and generated docs up to date), and generator tests. - New ExecutionManager tests cover: - interpreted, R2R, funclet, poison, prefers-interpreter, not-own-entry-point and unknown-index cases; - an end-to-end check that the resolved virtual IP maps back to the MethodDesc through `GetCodeBlockHandle`; - readable `PortableEntryPoint`-shaped bytes inside a registered code range staying unchanged. This test fails if the range check is removed. - a cyclic function-table range list; - the non-portable delegation path. - CoreCLR `clr.runtime` builds for osx-arm64 Debug (with `FEATURE_INTERPRETER`) and browser-wasm Debug. The generated wasm descriptor has `PortableEntryPoint {ActualCode@0, MethodDesc@4, Flags@12}`. - A new `DacDbiImplTests` test covers `EnumerateAsyncLocals` mapping for both the code-address and MethodDesc paths. It fails without the fix. - cDAC dump tests (osx-arm64, local runtime): 260 passed, 0 failed. The 746 skips are net10.0 configurations plus by-design skips (Windows-only COM debuggees, and dump types a debuggee doesn't produce). - CoreCLR `clr.runtime` Release (osx-arm64) builds with the `dacdbiimpl.cpp` change. - Not run: any check against a live wasm target. Fixes #134753 > [!NOTE] > This PR description was generated with GitHub Copilot. --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

…d R2R virtual IPs (#134756)" This reverts commit 257bac4. The cDAC change was merged into this branch by mistake while stacked; it will be submitted separately against main. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

…rtual IPs (#134827) This replaces #134756, which was merged into #134754's branch by mistake and reverted there. The change is otherwise identical (cherry-picked onto `main`). ## Problem On `FEATURE_PORTABLE_ENTRYPOINTS` targets (WebAssembly), a method's entry point slot holds a `PortableEntryPoint` address. Native maps it before handing it to diagnostics (`GetInterpreterCodeFromEntryPointIfPresent` / `GetDiagnosticCodeStartFromEntryPoint` in `precode.cpp`), but the cDAC returned the raw address. SOS values such as `DacpMethodDescData.NativeCodeAddr` and rejit `NativeCodeAddr`, plus the DBI/`ClrDataMethodInstance` paths, therefore reported an address that doesn't resolve through `ExecutionManager` for both interpreted and R2R methods. ## Change Adds `IExecutionManager.GetDiagnosticCodeStartFromEntryPoint`, which mirrors the native `GetDiagnosticCodeStartFromEntryPoint`: - **Without portable entrypoints:** delegates to `PrecodeStubs.GetInterpreterCodeFromInterpreterPrecodeIfPresent`. Behavior is unchanged. - **With portable entrypoints:** 1. Returns the address unchanged if it lies in a code range. This is the native `FindCodeRange` check and includes Wasm R2R virtual-IP ranges from #133917. 2. Maps interpreted methods to `MethodDesc::m_interpreterCode`. 3. Maps native R2R methods from the function-table index in `PortableEntryPoint._pActualCode` to the synthetic virtual IP, stepping back past funclet entries. This matches `ExecutionManager::GetWasmVirtualIPFromFunctionTableIndex`. As in native code, it applies only to the method's own (temporary) entry point, and only when the entry point doesn't prefer the interpreter. The mapping lives in ExecutionManager rather than PrecodeStubs because ExecutionManager owns the virtual-IP ranges and R2R lookup. ExecutionManager already depends on PrecodeStubs, so this adds no contract cycle. Function-table-index resolution moves into `ExecutionManagerHelpers.WasmFunctionTableIndexLookup`, which now bounds the list walk and detects cycles, like the virtual-IP list walk. The stack walk's `WasmR2RInfo` becomes a thin wrapper over it. The Legacy SOS/DBI callers (`SOSDacImpl`, `ClrDataMethodInstance`, `DacDbiImpl`) now call the new API. `DacDbiImpl.EnumerateAsyncLocals` also maps its code address before querying async debug info. The native DAC's `EnumerateAsyncLocals` gets the matching `GetInterpreterCodeFromEntryPointIfPresent` mapping (as `GetMethodVarInfo` already does), so the debug-build cDAC/DAC cross-check stays consistent. ### Data descriptors - `PortableEntryPoint.ActualCode` and `PortableEntryPoint.Flags` (only under `FEATURE_PORTABLE_ENTRYPOINTS`). - `MethodDesc.InterpreterCode` (only under `FEATURE_INTERPRETER`). - The contract relies on `kPrefersInterpreterEntryPoint` and `INTERPRETER_CODE_POISON`; the native side now has `[cDAC]` comments marking that dependency. ### Interaction with #133890 #133890 adds `TryGetFunctionIdentity` and `TryIsFunclet` to `WasmR2RInfo`. Whichever PR lands second should add those two methods to `WasmFunctionTableIndexLookup` and have `WasmR2RInfo` forward to them. The `FunctionTableIndexRange*` descriptor meanings here already use #133890's exact wording, so that JSON should merge cleanly. ## Validation - cDAC: `./build.sh -s tools.cdac+tools.cdactests -c Debug -test` passes: 3196 unit tests (17 new), usage tests (contract cycles and generated docs up to date), and generator tests. - New ExecutionManager tests cover: - interpreted, R2R, funclet, poison, prefers-interpreter, not-own-entry-point and unknown-index cases; - an end-to-end check that the resolved virtual IP maps back to the MethodDesc through `GetCodeBlockHandle`; - readable `PortableEntryPoint`-shaped bytes inside a registered code range staying unchanged. This test fails if the range check is removed. - a cyclic function-table range list; - the non-portable delegation path. - CoreCLR `clr.runtime` builds for osx-arm64 Debug (with `FEATURE_INTERPRETER`) and browser-wasm Debug. The generated wasm descriptor has `PortableEntryPoint {ActualCode@0, MethodDesc@4, Flags@12}`. - A new `DacDbiImplTests` test covers `EnumerateAsyncLocals` mapping for both the code-address and MethodDesc paths. It fails without the fix. - cDAC dump tests (osx-arm64, local runtime): 260 passed, 0 failed. The 746 skips are net10.0 configurations plus by-design skips (Windows-only COM debuggees, and dump types a debuggee doesn't produce). - CoreCLR `clr.runtime` Release (osx-arm64) builds with the `dacdbiimpl.cpp` change. - Re-validated after cherry-picking onto `main`: `./build.sh clr -c Debug` (osx-arm64) builds, and `./build.sh -s tools.cdac+tools.cdactests -c Debug -test` passes (3196 unit tests, 46 generator tests, 4 usage tests; 0 failed). - Not run: any check against a live wasm target. Resolves #134753 > [!NOTE] > This PR description was generated with GitHub Copilot. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

lewing and others added 2 commits September 27, 2026 16:06

github-actions Bot added the area-VM-coreclr label Sep 27, 2026

dotnet-policy-service Bot assigned lewing Sep 27, 2026

lewing added the arch-wasm WebAssembly architecture label Sep 27, 2026

lewing requested review from AndyAyersMS and davidwrighton September 27, 2026 21:31

lewing mentioned this pull request Sep 27, 2026

[cDAC][wasm] Map portable entry points to interpreter code and R2R virtual IPs #134756

Merged

lewing added this pull request to stack #134757 September 27, 2026 22:26

lewing requested a lite review from Copilot September 27, 2026 22:58

Copilot started reviewing on behalf of lewing September 27, 2026 22:59 View session

Copilot AI reviewed Sep 27, 2026

View reviewed changes

This was referenced Sep 28, 2026

Async2TaskAdapters.TestValueTaskOfTaskValueVersusAsync fails with SanityCheck() in Wasm R2R test #133953

Open

Crash: access violation in coreclr!PgoManager::getPgoInstrumentationResults during tier-1 background JIT (Windows x86) #134695

Open

This was referenced Sep 28, 2026

[wasm][R2R] StateMachineAsync profiler callstack identities do not resolve #134145

Closed

[ci-scan] Test failure: SanityCheck assert in nested EH tests on browser wasm R2R (Methodical_d1) #134768

Closed

davidwrighton requested changes Sep 28, 2026

View reviewed changes

Comment thread src/coreclr/vm/runtimehandles.cpp Outdated

lewing and others added 2 commits September 28, 2026 18:00

Rename GetNativeCode QCall to GetDiagnosticCodeStart

98d9430

The value returned is only meaningful for diagnostic reporting (on Wasm it may be interpreter bytecode or a synthetic virtual IP), so name it accordingly. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Update AsyncProfiler tests for GetDiagnosticCodeStart rename

316ae72

The Mono fallback in AsyncProfilerTests looks up the wrapper by name via reflection. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

lewing requested review from steveisok and vitek-karas as code owners September 28, 2026 23:06

lewing requested a review from davidwrighton September 28, 2026 23:19

davidwrighton approved these changes Sep 28, 2026

View reviewed changes

lewing removed this pull request from stack #134757 September 29, 2026 00:29

lewing enabled auto-merge (squash) September 29, 2026 00:30

lewing mentioned this pull request Sep 29, 2026

[cDAC][wasm] Map portable entry points to interpreter code and R2R virtual IPs #134827

Merged

steveisok approved these changes Sep 29, 2026

View reviewed changes

agocke requested a review from jtschuster September 29, 2026 02:46

lewing merged commit 49e04fa into main Sep 29, 2026
146 of 148 checks passed

lewing deleted the lewing-fix-wasm-r2r-statemachine-profiler-calls branch September 29, 2026 04:18

dotnet-maestro Bot mentioned this pull request Sep 30, 2026

[main] Source code updates from dotnet/runtime dotnet/dotnet#9845

Merged

dotnet-milestone-bot Bot added this to the 12.0-preview1 milestone Sep 30, 2026

Navigation Menu

[wasm][R2R] Map state machine MoveNext method ids to virtual IPs - #134754

[wasm][R2R] Map state machine MoveNext method ids to virtual IPs#134754
lewing merged 6 commits into
mainfrom
lewing-fix-wasm-r2r-statemachine-profiler-calls

lewing commented Sep 27, 2026

Uh oh!

azure-pipelines Bot commented Sep 27, 2026

Uh oh!

dotnet-policy-service Bot commented Sep 27, 2026

Uh oh!

dotnet-policy-service Bot commented Sep 27, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

lewing commented Sep 28, 2026

Uh oh!

davidwrighton left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

lewing commented Sep 27, 2026

Summary

Validation

Follow-up

Uh oh!

azure-pipelines Bot commented Sep 27, 2026

Uh oh!

dotnet-policy-service Bot commented Sep 27, 2026

Uh oh!

dotnet-policy-service Bot commented Sep 27, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot review overview

🔵 Needs a closer look

Uh oh!

lewing commented Sep 28, 2026

Uh oh!

davidwrighton left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants