Skip to content
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

Jump to bottom

Don't propagate const TYP_REF as TYP_I_IMPL #75661

Merged
merged 15 commits into from
Sep 17, 2022
Merged

Don't propagate const TYP_REF as TYP_I_IMPL #75661

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5d7112c
don't propagate const TYP_REF as TYP_I_IMPL
EgorBo Sep 15, 2022
a22fecc
Fix more asserts
EgorBo Sep 15, 2022
bfdd32b
fix dump
EgorBo Sep 15, 2022
e152c0c
Allow re-typing for TYP_REF null (to minimize spmi diffs)
EgorBo Sep 15, 2022
ece6a3d
Don't "share" const gc handles
EgorBo Sep 15, 2022
fcebb53
Address feedback
EgorBo Sep 15, 2022
04b7f02
VN replace STR_HDL with CONST_HDL
EgorBo Sep 15, 2022
52609d1
Looks like we used to allow const prop for TYP_REF <- TYP_I_IMPL for …
EgorBo Sep 15, 2022
2f89efa
Fix unfortunate typo :(
EgorBo Sep 15, 2022
2785b2d
fix ref2byref_il_r test
EgorBo Sep 16, 2022
32180d2
Merge branch 'main' of github.com:dotnet/runtime into fix-assert-asse…
EgorBo Sep 16, 2022
1cae571
fix critical_finalization test
EgorBo Sep 16, 2022
20829d3
disallow REF -> BYREF propagation
EgorBo Sep 16, 2022
9421d59
assert was wrong - in case of pinned locals it's fine to pass int han…
EgorBo Sep 16, 2022
a9d6fa7
Update assertionprop.cpp
EgorBo Sep 16, 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
3 changes: 3 additions & 0 deletions src/coreclr/jit/assertionprop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3420,6 +3420,9 @@ GenTree* Compiler::optConstantAssertionProp(AssertionDsc* curAssertion,
// Here we have to allocate a new 'large' node to replace the old one
newTree = gtNewIconHandleNode(curAssertion->op2.u1.iconVal,
curAssertion->op2.u1.iconFlags & GTF_ICON_HDL_MASK);

// Make sure we don't change TYP_REF to an integer
newTree->ChangeType(tree->TypeGet());
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/emitxarch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13080,7 +13080,7 @@ BYTE* emitter::emitOutputRI(BYTE* dst, instrDesc* id)
break;

case IF_RRW_CNS:
assert(id->idGCref() == GCT_BYREF);
assert((id->idGCref() == GCT_BYREF) || (id->idGCref() == GCT_GCREF));
EgorBo marked this conversation as resolved.
Show resolved Hide resolved

#ifdef DEBUG
regMaskTP regMask;
Expand Down
11 changes: 9 additions & 2 deletions src/coreclr/jit/gentree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11121,8 +11121,15 @@ void Compiler::gtDispConst(GenTree* tree)

if (tree->TypeGet() == TYP_REF)
{
assert(tree->AsIntCon()->gtIconVal == 0);
printf(" null");
if (tree->AsIntCon()->gtIconVal == 0)
{
printf(" null");
}
else
{
assert(doesMethodHaveFrozenString());
printf(" 0x%llx", dspIconVal);
}
}
else if ((tree->AsIntCon()->gtIconVal > -1000) && (tree->AsIntCon()->gtIconVal < 1000))
{
Expand Down