Skip to content

[Wasm RyuJit] More crossgen assert fixes#125102

Open
AndyAyersMS wants to merge 9 commits intodotnet:mainfrom
AndyAyersMS:WasmFixes5
Open

[Wasm RyuJit] More crossgen assert fixes#125102
AndyAyersMS wants to merge 9 commits intodotnet:mainfrom
AndyAyersMS:WasmFixes5

Conversation

@AndyAyersMS
Copy link
Member

  • use gtOverflowEx instead of gtOverflow
  • not all block stores need null checks
  • more cases where we don't have putarg stacks
  • add lowering was bypassing Wasm overflow checking

* use gtOverflowEx instead of gtOverflow
* not all block stores need null checks
* more cases where we don't have putarg stacks
* add lowering was bypassing Wasm overflow checking
Copilot AI review requested due to automatic review settings March 3, 2026 04:40
@github-actions github-actions bot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label Mar 3, 2026
@AndyAyersMS
Copy link
Member Author

We might be able to be even more fine-grained with the null checks.

Also not 100% sure yet what to do with all the operand reordering for calls, but this at least tolerates the way Wasm does things.

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR fixes several assert failures in the WASM RyuJIT cross-compilation codepath ("crossgen assert fixes"):

Changes:

  • Replace incorrect gtOverflow() calls with gtOverflowEx() in WASM-specific lowering and codegen, since gtOverflow() asserts OperMayOverflow() and these sites can be reached with non-overflow-capable operators (AND, OR, XOR).
  • Fix overflow checking for GT_ADD on WASM: LowerAdd was not calling LowerBinaryArithmetic, so the SetMultiplyUsed() calls needed to set up overflow-checking registers were skipped for overflow ADDs.
  • Guard null checks in genCodeForCpObj behind a doNullChecks flag (GTF_EXCEPT && OperMayThrow) since not all block-copy operations need null checks.
  • Fix asserts in MovePutArgUpToCall/MovePutArgNodesUpToCall that assumed nodes must be GT_PUTARG_* or GT_FIELD_LIST, which is not true on WASM where HAS_FIXED_REGISTER_SET = 0.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File Description
src/coreclr/jit/lowerwasm.cpp Use gtOverflowEx() instead of gtOverflow() in LowerBinaryArithmetic for correctness when called with non-overflow-capable operators (AND/OR/XOR)
src/coreclr/jit/lower.cpp Fix MovePutArgUpToCall/MovePutArgNodesUpToCall asserts for WASM (no PutArg nodes); add new else branch for plain arg nodes; call LowerBinaryArithmetic from LowerAdd on WASM to fix missing overflow setup for ADD
src/coreclr/jit/codegenwasm.cpp Use gtOverflowEx() instead of gtOverflow() in genCodeForBinary; gate null checks in genCodeForCpObj behind doNullChecks for correctness when copies are known safe

@am11 am11 added arch-wasm WebAssembly architecture labels Mar 4, 2026
@dotnet-policy-service
Copy link
Contributor

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

1 similar comment
@dotnet-policy-service
Copy link
Contributor

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

Copilot AI review requested due to automatic review settings March 4, 2026 15:22
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

Copy link
Contributor

@SingleAccretion SingleAccretion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM modulo comments.

}
else // A normal store, not a WriteBarrier store
{
if ((tree->gtFlags & GTF_IND_NONFAULTING) == 0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, I think it would be better for now at least to consider null checking a wholly Jit side responsibility. Pushing it into the write barrier is not 'simple' (at the very least it forces us to figure out how to put the SP argument into the right place here).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I agree.

I still need to revise the code in Lower that bypasses Wasm lowering for stores with write barriers.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am tempted to add GT_IND nullchecks here, though that may be a big enough project that it should be its own PR.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to null check for any storeind that needs it. Going to defer indirect loads.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: SingleAccretion <62474226+SingleAccretion@users.noreply.github.com>
Copilot AI review requested due to automatic review settings March 4, 2026 15:59
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated no new comments.

Comments suppressed due to low confidence (1)

src/coreclr/jit/lower.cpp:8056

  • In LowerAdd, the LowerBinaryArithmetic(node) call (line 8049) already invokes ContainCheckBinary internally (see lowerwasm.cpp line 174). The code then falls through to call ContainCheckBinary(node) again at line 8055 for WASM. Since WASM's ContainCheckBinary is an empty no-op, this is functionally harmless but is a redundant double call. Returning early from the WASM block (or not calling ContainCheckBinary again for WASM) would be cleaner.
#if defined(TARGET_WASM)
    if (node->OperIs(GT_ADD))
    {
        LowerBinaryArithmetic(node);
    }
#endif

    if (node->OperIs(GT_ADD))
    {
        ContainCheckBinary(node);
    }

@AndyAyersMS AndyAyersMS marked this pull request as ready for review March 4, 2026 22:38
Copilot AI review requested due to automatic review settings March 4, 2026 22:38
@AndyAyersMS
Copy link
Member Author

@dotnet/jit-contrib PTAL

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated no new comments.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

arch-wasm WebAssembly architecture area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants