Skip to content

Fix flags in EarlyProp after nullcheck is removed #112717

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 2 commits into from
Feb 20, 2025
Merged

Fix flags in EarlyProp after nullcheck is removed #112717

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a04651
Fix flags in EarlyProp after nullcheck is removed
EgorBo Feb 19, 2025
3a05bce
Remove redundant SetIndirExceptionFlags call
EgorBo Feb 20, 2025
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
4 changes: 4 additions & 0 deletions src/coreclr/jit/earlyprop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,10 @@ bool Compiler::optFoldNullCheck(GenTree* tree, LocalNumberToNullCheckTreeMap* nu
nullCheckTree->SetHasOrderingSideEffect();
nullCheckTree->gtFlags |= GTF_IND_NONFAULTING;

// The current indir is no longer non-faulting.
tree->gtFlags &= ~GTF_IND_NONFAULTING;
tree->SetIndirExceptionFlags(this);
Copy link
Member Author

@EgorBo EgorBo Feb 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

I presume in theory we can avoid removing GTF_IND_NONFAULTING and adding GTF_EXCEPT if the leading (if it is in fact leading) nullcheck had them, but wanted to be on a safer side

Copy link
Member

@jakobbotsch jakobbotsch Feb 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Is the SetIndirExceptionFlags necessary? I assume it should be recomputed below when all side effect flags are updated.

Copy link
Member Author

@EgorBo EgorBo Feb 20, 2025

Choose a reason for hiding this comment

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

Correct, GTF_EXCEPT is set later via gtUpdateNodeOperSideEffects, so this one is redundant


if (nullCheckParent != nullptr)
{
nullCheckParent->gtFlags &= ~GTF_DONT_CSE;
Expand Down
Loading