Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 9 additions & 4 deletions src/coreclr/jit/codegencommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,9 @@ CodeGen::CodeGen(Compiler* theCompiler)
m_cgEmitter->codeGen = this;
m_cgEmitter->gcInfo = &gcInfo;

// On wasm this is never set by register allocation, so initialize it here.
calleeRegArgMaskLiveIn = RBM_NONE;
Comment thread
AndyAyersMS marked this conversation as resolved.

#ifdef DEBUG
setVerbose(m_compiler->verbose);
#endif // DEBUG
Expand Down Expand Up @@ -3415,6 +3418,11 @@ void CodeGen::genHomeRegisterParams(regNumber initReg, bool* initRegStillZeroed)
}
#endif

if (calleeRegArgMaskLiveIn == RBM_NONE)
{
return;
}

regMaskTP paramRegs = calleeRegArgMaskLiveIn;
if (m_compiler->opts.OptimizationDisabled())
{
Expand Down Expand Up @@ -5834,10 +5842,7 @@ void CodeGen::genFnProlog()

genHomeStackPartOfSplitParameter(initReg, &initRegZeroed);

if (calleeRegArgMaskLiveIn != RBM_NONE)
{
genHomeRegisterParams(initReg, &initRegZeroed);
}
genHomeRegisterParams(initReg, &initRegZeroed);
Comment thread
AndyAyersMS marked this conversation as resolved.

// Home the incoming arguments.
genEnregisterIncomingStackArgs();
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/jit/codegenwasm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ void CodeGen::genHomeRegisterParams(regNumber initReg, bool* initRegStillZeroed)
assert(segment.IsPassedInRegister());

LclVarDsc* varDsc = m_compiler->lvaGetDesc(lclNum);
// Skip homing parameters that are dead at method entry (not live into the first block).
if (varDsc->lvTracked && !VarSetOps::IsMember(m_compiler, m_compiler->fgFirstBB->bbLiveIn, varDsc->lvVarIndex))
Comment thread
AndyAyersMS marked this conversation as resolved.
{
return;
Comment thread
AndyAyersMS marked this conversation as resolved.
Expand Down
Loading