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

Delete GTF_ASSERTION_PROP_LONG #70521

Merged
merged 1 commit into from
Jun 14, 2022
Merged

Delete GTF_ASSERTION_PROP_LONG #70521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 2 additions & 28 deletions src/coreclr/jit/assertionprop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1431,9 +1431,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
assertion.op2.vn = ValueNumStore::VNForNull();
assertion.op2.u1.iconVal = 0;
assertion.op2.u1.iconFlags = GTF_EMPTY;
#ifdef TARGET_64BIT
assertion.op2.u1.iconFlags |= GTF_ASSERTION_PROP_LONG; // Signify that this is really TYP_LONG
#endif // TARGET_64BIT
}
//
// Are we making an assertion about a local variable?
Expand Down Expand Up @@ -1568,13 +1565,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
#endif // TARGET_ARM
assertion.op2.u1.iconVal = op2->AsIntCon()->gtIconVal;
assertion.op2.u1.iconFlags = op2->GetIconHandleFlag();
#ifdef TARGET_64BIT
if (op2->TypeGet() == TYP_LONG || op2->TypeGet() == TYP_BYREF)
{
assertion.op2.u1.iconFlags |=
GTF_ASSERTION_PROP_LONG; // Signify that this is really TYP_LONG
}
#endif // TARGET_64BIT
}
else if (op2->gtOper == GT_CNS_LNG)
{
Expand Down Expand Up @@ -1731,12 +1721,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
/* iconFlags should only contain bits in GTF_ICON_HDL_MASK */
assert((iconFlags & ~GTF_ICON_HDL_MASK) == 0);
assertion.op2.u1.iconFlags = iconFlags;
#ifdef TARGET_64BIT
if (op2->AsOp()->gtOp1->TypeGet() == TYP_LONG)
{
assertion.op2.u1.iconFlags |= GTF_ASSERTION_PROP_LONG; // Signify that this is really TYP_LONG
}
#endif // TARGET_64BIT
}
// JIT case
else if (optIsTreeKnownIntValue(!optLocalAssertionProp, op2, &cnsValue, &iconFlags))
Expand All @@ -1749,12 +1733,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
/* iconFlags should only contain bits in GTF_ICON_HDL_MASK */
assert((iconFlags & ~GTF_ICON_HDL_MASK) == 0);
assertion.op2.u1.iconFlags = iconFlags;
#ifdef TARGET_64BIT
if (op2->TypeGet() == TYP_LONG)
{
assertion.op2.u1.iconFlags |= GTF_ASSERTION_PROP_LONG; // Signify that this is really TYP_LONG
}
#endif // TARGET_64BIT
}
else
{
Expand Down Expand Up @@ -2047,13 +2025,9 @@ void Compiler::optDebugCheckAssertion(AssertionDsc* assertion)
case O2K_IND_CNS_INT:
case O2K_CONST_INT:
{
// The only flags that can be set are those in the GTF_ICON_HDL_MASK, or GTF_ASSERTION_PROP_LONG, which is
// used to indicate a long constant.
#ifdef TARGET_64BIT
assert((assertion->op2.u1.iconFlags & ~(GTF_ICON_HDL_MASK | GTF_ASSERTION_PROP_LONG)) == 0);
#else
// The only flags that can be set are those in the GTF_ICON_HDL_MASK.
assert((assertion->op2.u1.iconFlags & ~GTF_ICON_HDL_MASK) == 0);
#endif

switch (assertion->op1.kind)
{
case O1K_EXACT_TYPE:
Expand Down
5 changes: 0 additions & 5 deletions src/coreclr/jit/gentree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,11 +605,6 @@ enum GenTreeFlags : unsigned int

GTF_SIMDASHW_OP = 0x80000000, // GT_HWINTRINSIC -- Indicates that the structHandle should be gotten from gtGetStructHandleForSIMD
// rather than from gtGetStructHandleForHWSIMD.

// Flag used by assertion prop to indicate that a type is a TYP_LONG
#ifdef TARGET_64BIT
GTF_ASSERTION_PROP_LONG = 0x00000001,
#endif // TARGET_64BIT
};

inline constexpr GenTreeFlags operator ~(GenTreeFlags a)
Expand Down