Skip to content

[release/7.0] JIT: fix incorrect scale in genCreateAddrMode + no-opt #75560

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
carlossanlop merged 9 commits into from
Sep 14, 2022
Merged

[release/7.0] JIT: fix incorrect scale in genCreateAddrMode + no-opt #75560

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cd8e78a
Fix invalid addressing mode scale in debug mode
EgorBo Sep 12, 2022
390d1f0
Add a test
EgorBo Sep 12, 2022
09714b0
Update Runtime_75312.il
EgorBo Sep 12, 2022
4e30ed3
Update Runtime_75312.ilproj
EgorBo Sep 12, 2022
1c18bb0
Drop unneeded initialization
EgorBo Sep 12, 2022
e3f5dd0
Slightly better fix
EgorBo Sep 12, 2022
219beba
Test an even better fix?
EgorBo Sep 12, 2022
5e6923e
Refactoring
EgorBo Sep 13, 2022
caf0d40
address feedback
EgorBo Sep 13, 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
address feedback
  • Loading branch information
@EgorBo
EgorBo authored and github-actions committed Sep 13, 2022
commit caf0d40e047b3065bc3235bf0a2b48587ff24efe
15 changes: 6 additions & 9 deletions src/coreclr/jit/codegencommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,18 +1379,15 @@ bool CodeGen::genCreateAddrMode(
}

// Special case: constant array index (that is range-checked)
if (fold && rv2->OperIs(GT_MUL, GT_LSH) && (rv2->gtGetOp2()->IsCnsIntOrI()))
if (fold)
{
// For valuetype arrays where we can't use the scaled address
// mode, rv2 will point to the scaled index. So we have to do
// more work
GenTree* index;
ssize_t indexScale = compiler->optGetArrayRefScaleAndIndex(rv2, &index DEBUGARG(false));
// By default, assume index is rv2 and indexScale is mul (or 1 if mul is zero)
GenTree* index = rv2;
ssize_t indexScale = mul == 0 ? 1 : mul;

// Apply accumulated scale if it exists
if (mul)
if (rv2->OperIs(GT_MUL, GT_LSH) && (rv2->gtGetOp2()->IsCnsIntOrI()))
{
indexScale *= mul;
indexScale *= compiler->optGetArrayRefScaleAndIndex(rv2, &index DEBUGARG(false));
}

// "index * 0" means index is zero
Expand Down