Skip to content

Deleting field sequences from LCL_FLD and VNF_PtrToArrElem #68986

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
jakobbotsch merged 6 commits into from
May 27, 2022
Merged

Deleting field sequences from LCL_FLD and VNF_PtrToArrElem #68986

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33016f1
Delete field sequences from GenTreeLclFld
SingleAccretion May 2, 2022
c7c1946
Delete field sequences from VNF_PtrToArrElem
SingleAccretion May 2, 2022
1e924ac
Clean up "DefinesLocalAddr"
SingleAccretion May 6, 2022
1562d2a
Also clean up block morphing a little
SingleAccretion May 6, 2022
836eac0
Fix a potential bug with return buffer numbering
SingleAccretion May 6, 2022
9de70e9
Fix another "VN maintainance in morph" bug
SingleAccretion May 14, 2022
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
Prev Previous commit
Next Next commit
Fix a potential bug with return buffer numbering 
Also address the TODO-CQ.
  • Loading branch information
@SingleAccretion
SingleAccretion committed May 23, 2022
commit 836eac06f0424d564fcc054ebdd3a995b5a6d0aa
22 changes: 7 additions & 15 deletions src/coreclr/jit/valuenum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9723,23 +9723,15 @@ void Compiler::fgValueNumberCall(GenTreeCall* call)

// If the call generates a definition, because it uses "return buffer", then VN the local
// as well.
GenTreeLclVarCommon* lclVarTree;
if (call->DefinesLocal(this, &lclVarTree))
GenTreeLclVarCommon* lclVarTree = nullptr;
ssize_t offset = 0;
if (call->DefinesLocal(this, &lclVarTree, /* pIsEntire */ nullptr, &offset))
{
assert((lclVarTree->gtFlags & GTF_VAR_DEF) != 0);

unsigned hiddenArgLclNum = lclVarTree->GetLclNum();
LclVarDsc* hiddenArgVarDsc = lvaGetDesc(hiddenArgLclNum);
unsigned lclDefSsaNum = GetSsaNumForLocalVarDef(lclVarTree);
ValueNumPair storeValue;
storeValue.SetBoth(vnStore->VNForExpr(compCurBB, TYP_STRUCT));
unsigned storeSize = typGetObjLayout(call->gtRetClsHnd)->GetSize();

// TODO-Bug: call "fgValueNumberLocalStore" here, currently this code fails to update
// the heap state if the local was address-exposed.
if (lclDefSsaNum != SsaConfig::RESERVED_SSA_NUM)
{
ValueNumPair newHiddenArgLclVNPair = ValueNumPair();
newHiddenArgLclVNPair.SetBoth(vnStore->VNForExpr(compCurBB, hiddenArgVarDsc->TypeGet()));
hiddenArgVarDsc->GetPerSsaData(lclDefSsaNum)->m_vnPair = newHiddenArgLclVNPair;
}
fgValueNumberLocalStore(call, lclVarTree, offset, storeSize, storeValue);
}
}

Expand Down