Skip to content

[release/6.0] Undo struct promotion on "RetInd" code path #58602

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
jeffschwMSFT merged 9 commits into from
Sep 7, 2021
Merged

[release/6.0] Undo struct promotion on "RetInd" code path #58602

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
53922ad
TOREVERT: small repro case
kunalspathak Aug 30, 2021
8712e19
Fix the undone struct promotion for return
kunalspathak Sep 2, 2021
d90d77f
Display lclVar number
kunalspathak Sep 2, 2021
098a8b8
Revert "TOREVERT: small repro case"
kunalspathak Sep 2, 2021
8f23a99
Add test case
kunalspathak Sep 2, 2021
f8f1587
jit format
kunalspathak Sep 2, 2021
b63cc87
Combine the condition
kunalspathak Sep 2, 2021
179e223
Add an assert to catch the missing places
kunalspathak Sep 2, 2021
b4cd640
Remove unneeded variable setting from csproj
kunalspathak Sep 2, 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
Prev Previous commit
Next Next commit
Combine the condition
  • Loading branch information
@kunalspathak
kunalspathak authored and github-actions committed Sep 3, 2021
commit b63cc87fda2dd77a7abff61bc17ef82fcf97edba
9 changes: 3 additions & 6 deletions src/coreclr/jit/morph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13997,13 +13997,10 @@ GenTree* Compiler::fgMorphRetInd(GenTreeUnOp* ret)

if (addr->OperIs(GT_ADDR) && addr->gtGetOp1()->OperIs(GT_LCL_VAR))
{
if (fgGlobalMorph)
// If struct promotion was undone, adjust the annotations
if (fgGlobalMorph && fgMorphImplicitByRefArgs(addr))
{
// If struct promotion was undone, adjust the annotations
if (fgMorphImplicitByRefArgs(addr))
{
return ind;
}
return ind;
}

// If `return` retypes LCL_VAR as a smaller struct it should not set `doNotEnregister` on that
Expand Down