Skip to content

JIT: Fix folding of GC pointer arithmetic in lowering #108838

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
merged 6 commits into from
Oct 21, 2024
Merged

JIT: Fix folding of GC pointer arithmetic in lowering #108838

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
759d1cb
JIT: Fix folding of GC pointer arithmetic in lowering
jakobbotsch Oct 14, 2024
1c1fe8f
JIT: Produce correctly typed IR in TLS helper expansion
jakobbotsch Oct 14, 2024
88c5307
Run jit-format
jakobbotsch Oct 14, 2024
6128af1
TYP_REF -> varTypeIsGC
jakobbotsch Oct 14, 2024
88569bf
Merge branch 'main' into fix-108830
jakobbotsch Oct 15, 2024
c79b7f2
Merge branch 'main' into fix-108830
jakobbotsch Oct 21, 2024
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
24 changes: 18 additions & 6 deletions src/coreclr/jit/lower.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6977,14 +6977,26 @@ GenTree* Lowering::LowerAdd(GenTreeOp* node)
{
// Fold (x + c1) + c2
while (op1->OperIs(GT_ADD) && op2->IsIntegralConst() && op1->gtGetOp2()->IsIntegralConst() &&
!node->gtOverflow() && !op1->gtOverflow() && !op2->AsIntConCommon()->ImmedValNeedsReloc(comp) &&
!op1->gtGetOp2()->AsIntConCommon()->ImmedValNeedsReloc(comp))
!node->gtOverflow() && !op1->gtOverflow())
{
GenTreeIntConCommon* cns1 = op1->gtGetOp2()->AsIntConCommon();
GenTreeIntConCommon* cns2 = op2->AsIntConCommon();

if (cns1->ImmedValNeedsReloc(comp) || cns2->ImmedValNeedsReloc(comp))
{
break;
}

if (varTypeIsGC(cns1) || (cns1->TypeGet() != cns2->TypeGet()))
{
break;
}

JITDUMP("Folding (x + c1) + c2. Before:\n");
DISPTREERANGE(BlockRange(), node);

int64_t c1 = op1->gtGetOp2()->AsIntConCommon()->IntegralValue();
int64_t c2 = op2->AsIntConCommon()->IntegralValue();
int64_t c1 = cns1->IntegralValue();
int64_t c2 = cns2->IntegralValue();

int64_t result;
if (genTypeSize(node) == sizeof(int64_t))
Expand All @@ -6996,10 +7008,10 @@ GenTree* Lowering::LowerAdd(GenTreeOp* node)
result = static_cast<int32_t>(c1) + static_cast<int32_t>(c2);
}

op2->AsIntConCommon()->SetIntegralValue(result);
cns2->SetIntegralValue(result);
node->gtOp1 = op1->gtGetOp1();

BlockRange().Remove(op1->gtGetOp2());
BlockRange().Remove(cns1);
BlockRange().Remove(op1);

op1 = node->gtGetOp1();
Expand Down
Loading