Skip to content

[Wasm RyuJit] fix issue in RewriteLocalStackStore #124673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyAyersMS merged 3 commits into from
Feb 21, 2026
+7 −4
Merged

[Wasm RyuJit] fix issue in RewriteLocalStackStore #124673

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23bfc0a
[Wasm RyuJit] fix issue in RewriteLocalStackStore
AndyAyersMS Feb 20, 2026
f2f33ab
capture layout before bashing too
AndyAyersMS Feb 20, 2026
81489d0
fix check for struct types
AndyAyersMS Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/coreclr/jit/regallocwasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,20 +331,23 @@ void WasmRegAlloc::RewriteLocalStackStore(GenTreeLclVarCommon* lclNode)

// TODO-WASM-RA: figure out the address mode story here. Right now this will produce an address not folded
// into the store's address mode. We can utilize a contained LEA, but that will require some liveness work.
uint16_t offset = lclNode->GetLclOffs();

var_types storeType = lclNode->TypeGet();
uint16_t offset = lclNode->GetLclOffs();
ClassLayout* layout = lclNode->GetLayout(m_compiler);
lclNode->SetOper(GT_LCL_ADDR);
lclNode->ChangeType(TYP_I_IMPL);
lclNode->AsLclFld()->SetLclOffs(offset);

GenTree* store;
GenTreeFlags indFlags = GTF_IND_NONFAULTING | GTF_IND_TGT_NOT_HEAP;
if (lclNode->TypeIs(TYP_STRUCT))
if (storeType == TYP_STRUCT)
{
store = m_compiler->gtNewStoreBlkNode(lclNode->GetLayout(m_compiler), lclNode, value, indFlags);
store = m_compiler->gtNewStoreBlkNode(layout, lclNode, value, indFlags);
}
else
{
store = m_compiler->gtNewStoreIndNode(lclNode->TypeGet(), lclNode, value, indFlags);
store = m_compiler->gtNewStoreIndNode(storeType, lclNode, value, indFlags);
}
CurrentRange().InsertAfter(lclNode, store);
CurrentRange().Remove(lclNode);
Expand Down
Loading