Skip to content

Mark promoted locals indirectly used by RETURNs DNER #67358

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

Closed
SingleAccretion wants to merge 1 commit into from
Closed

Mark promoted locals indirectly used by RETURNs DNER #67358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 20 additions & 1 deletion src/coreclr/jit/morph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12985,6 +12985,26 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac)
}
break;

case GT_RETURN:
{
// Force dependent promotion for promoted locals which we'll use indirectly.
// Only needed for "TYP_STRUCT" because we expect the "IND(ADDR(LCL))" logic
// to transform primitives into "LCL_FLD"s (marking the local DNER).
// TODO-ADDR: support "TYP_STRUCT" "LCL_FLD"s, always convert such indirs to
// them in "LocalAddressVisitor", and have this code morph the local field
// into the promoted field local.
GenTreeLclVarCommon* lclNode = nullptr;
bool isEntire = false;
if ((op1 != nullptr) && op1->TypeIs(TYP_STRUCT) && op1->OperIsIndir() &&
op1->AsIndir()->Addr()->DefinesLocalAddr(this, 0, &lclNode, &isEntire) &&
lvaGetDesc(lclNode)->lvPromoted)
{
assert(!lvaIsImplicitByRefLocal(lclNode->GetLclNum()));
lvaSetVarDoNotEnregister(lclNode->GetLclNum() DEBUGARG(DoNotEnregisterReason::BlockOpRet));
}
}
break;

case GT_COLON:
if (fgGlobalMorph)
{
Expand Down Expand Up @@ -14346,7 +14366,6 @@ GenTree* Compiler::fgMorphRetInd(GenTreeUnOp* ret)

unsigned lclVarSize;
if (!lclVar->TypeIs(TYP_STRUCT))

{
lclVarSize = genTypeSize(varDsc->TypeGet());
}
Expand Down