Skip to content

JIT: check that constant handles are not OK2_CONST_LONGs #1831

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
AndyAyersMS merged 3 commits into from
Jan 21, 2020
Merged

JIT: check that constant handles are not OK2_CONST_LONGs #1831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f21f4c
JIT: check that constant handles are not OK2_CONST_LONGs
AndyAyersMS Jan 16, 2020
bee5b39
add padding to IntVal
AndyAyersMS Jan 17, 2020
5cfe9d2
review feedback
AndyAyersMS Jan 17, 2020
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
13 changes: 8 additions & 5 deletions src/coreclr/src/jit/assertionprop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,11 +1081,6 @@ AssertionIndex Compiler::optCreateAssertion(GenTree* op1,
if (op2->gtOper == GT_CNS_INT)
{
#ifdef _TARGET_ARM_
// Do not Constant-Prop immediate values that require relocation
if (op2->AsIntCon()->ImmedValNeedsReloc(this))
{
goto DONE_ASSERTION;
}
// Do not Constant-Prop large constants for ARM
// TODO-CrossBitness: we wouldn't need the cast below if GenTreeIntCon::gtIconVal had
// target_ssize_t type.
Expand Down Expand Up @@ -1643,6 +1638,14 @@ void Compiler::optDebugCheckAssertion(AssertionDsc* assertion)
}
break;

case O2K_CONST_LONG:
{

@briansull briansull Jan 17, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't really need the braces { } here.

// All handles should be represented by O2K_CONST_INT,
// so no handle bits should be set here.
assert((assertion->op2.u1.iconFlags & GTF_ICON_HDL_MASK) == 0);
}
break;

@briansull briansull Jan 17, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should have a break here

default:
// for all other 'assertion->op2.kind' values we don't check anything
break;
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/src/jit/compiler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6482,6 +6482,7 @@ class Compiler
struct IntVal
{
ssize_t iconVal; // integer
unsigned padding; // unused; ensures iconFlags does not overlap lconVal
unsigned iconFlags; // gtFlags
};
struct Range // integer subrange
Expand Down