Skip to content

JIT: fix register arg size computation for OSR #59789

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 2 commits into from
Oct 1, 2021
Merged

JIT: fix register arg size computation for OSR #59789

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2a059c
JIT: fix register arg size computation for OSR
AndyAyersMS Sep 30, 2021
c247193
add assert for not seeing multi-reg args
AndyAyersMS Sep 30, 2021
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
12 changes: 11 additions & 1 deletion src/coreclr/jit/codegencommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6283,6 +6283,15 @@ void CodeGen::genZeroInitFrame(int untrLclHi, int untrLclLo, regNumber initReg,
continue;
}

// We currently don't expect to see multi-reg args in OSR methods, as struct
// promotion is disabled and so any struct arg just uses the spilled location
// on the original frame.
//
// If we ever enable promotion we'll need to generalize what follows to copy each
// field from the original frame to its OSR home.
//
assert(!varDsc->lvIsMultiRegArg);

if (!VarSetOps::IsMember(compiler, compiler->fgFirstBB->bbLiveIn, varDsc->lvVarIndex))
{
JITDUMP("---OSR--- V%02u (reg) not live at entry\n", varNum);
Expand All @@ -6302,7 +6311,8 @@ void CodeGen::genZeroInitFrame(int untrLclHi, int untrLclLo, regNumber initReg,
}

// Note we are always reading from the original frame here
const var_types lclTyp = genActualType(varDsc->lvType);
//
const var_types lclTyp = varDsc->GetActualRegisterType();
const emitAttr size = emitTypeSize(lclTyp);
const int stkOffs = patchpointInfo->Offset(lclNum) + fieldOffset;

Expand Down