Skip to content

Commit b85f6b3

Browse files
Delete GTF_ASSERTION_PROP_LONG (#70521)
1 parent 4fc6287 commit b85f6b3

File tree

2 files changed

+2
-33
lines changed

2 files changed

+2
-33
lines changed

src/coreclr/jit/assertionprop.cpp

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,9 +1431,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
14311431
assertion.op2.vn = ValueNumStore::VNForNull();
14321432
assertion.op2.u1.iconVal = 0;
14331433
assertion.op2.u1.iconFlags = GTF_EMPTY;
1434-
#ifdef TARGET_64BIT
1435-
assertion.op2.u1.iconFlags |= GTF_ASSERTION_PROP_LONG; // Signify that this is really TYP_LONG
1436-
#endif // TARGET_64BIT
14371434
}
14381435
//
14391436
// Are we making an assertion about a local variable?
@@ -1568,13 +1565,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
15681565
#endif // TARGET_ARM
15691566
assertion.op2.u1.iconVal = op2->AsIntCon()->gtIconVal;
15701567
assertion.op2.u1.iconFlags = op2->GetIconHandleFlag();
1571-
#ifdef TARGET_64BIT
1572-
if (op2->TypeGet() == TYP_LONG || op2->TypeGet() == TYP_BYREF)
1573-
{
1574-
assertion.op2.u1.iconFlags |=
1575-
GTF_ASSERTION_PROP_LONG; // Signify that this is really TYP_LONG
1576-
}
1577-
#endif // TARGET_64BIT
15781568
}
15791569
else if (op2->gtOper == GT_CNS_LNG)
15801570
{
@@ -1731,12 +1721,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
17311721
/* iconFlags should only contain bits in GTF_ICON_HDL_MASK */
17321722
assert((iconFlags & ~GTF_ICON_HDL_MASK) == 0);
17331723
assertion.op2.u1.iconFlags = iconFlags;
1734-
#ifdef TARGET_64BIT
1735-
if (op2->AsOp()->gtOp1->TypeGet() == TYP_LONG)
1736-
{
1737-
assertion.op2.u1.iconFlags |= GTF_ASSERTION_PROP_LONG; // Signify that this is really TYP_LONG
1738-
}
1739-
#endif // TARGET_64BIT
17401724
}
17411725
// JIT case
17421726
else if (optIsTreeKnownIntValue(!optLocalAssertionProp, op2, &cnsValue, &iconFlags))
@@ -1749,12 +1733,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
17491733
/* iconFlags should only contain bits in GTF_ICON_HDL_MASK */
17501734
assert((iconFlags & ~GTF_ICON_HDL_MASK) == 0);
17511735
assertion.op2.u1.iconFlags = iconFlags;
1752-
#ifdef TARGET_64BIT
1753-
if (op2->TypeGet() == TYP_LONG)
1754-
{
1755-
assertion.op2.u1.iconFlags |= GTF_ASSERTION_PROP_LONG; // Signify that this is really TYP_LONG
1756-
}
1757-
#endif // TARGET_64BIT
17581736
}
17591737
else
17601738
{
@@ -2047,13 +2025,9 @@ void Compiler::optDebugCheckAssertion(AssertionDsc* assertion)
20472025
case O2K_IND_CNS_INT:
20482026
case O2K_CONST_INT:
20492027
{
2050-
// The only flags that can be set are those in the GTF_ICON_HDL_MASK, or GTF_ASSERTION_PROP_LONG, which is
2051-
// used to indicate a long constant.
2052-
#ifdef TARGET_64BIT
2053-
assert((assertion->op2.u1.iconFlags & ~(GTF_ICON_HDL_MASK | GTF_ASSERTION_PROP_LONG)) == 0);
2054-
#else
2028+
// The only flags that can be set are those in the GTF_ICON_HDL_MASK.
20552029
assert((assertion->op2.u1.iconFlags & ~GTF_ICON_HDL_MASK) == 0);
2056-
#endif
2030+
20572031
switch (assertion->op1.kind)
20582032
{
20592033
case O1K_EXACT_TYPE:

src/coreclr/jit/gentree.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -605,11 +605,6 @@ enum GenTreeFlags : unsigned int
605605

606606
GTF_SIMDASHW_OP = 0x80000000, // GT_HWINTRINSIC -- Indicates that the structHandle should be gotten from gtGetStructHandleForSIMD
607607
// rather than from gtGetStructHandleForHWSIMD.
608-
609-
// Flag used by assertion prop to indicate that a type is a TYP_LONG
610-
#ifdef TARGET_64BIT
611-
GTF_ASSERTION_PROP_LONG = 0x00000001,
612-
#endif // TARGET_64BIT
613608
};
614609

615610
inline constexpr GenTreeFlags operator ~(GenTreeFlags a)

0 commit comments

Comments
 (0)