-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Java: Make separate classes for different control flow node kinds #17996
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.
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
owen-mc
merged 3 commits into
github:main
from
owen-mc:java/lightweight-IR-layer-classes
Dec 12, 2024
Merged
Java: Make separate classes for different control flow node kinds #17996
owen-mc
merged 3 commits into
github:main
from
owen-mc:java/lightweight-IR-layer-classes
Dec 12, 2024
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
private ControlFlowNode mainBranchSucc(ControlFlowNode n, boolean b) { | ||
result = succ(n, BooleanCompletion(_, b)) | ||
} | ||
private Node mainBranchSucc(Node n, boolean b) { result = succ(n, BooleanCompletion(_, b)) } |
Check warning
Code scanning / CodeQL
Missing QLDoc for parameter Warning
The QLDoc has no documentation for b, or n, but the QLDoc mentions booleanCompletion
@@ -1487,8 +1602,8 @@ | |||
* In the latter case, when `n` occurs as the last node in a finally block, there might be | |||
* multiple different such successors. | |||
*/ | |||
private ControlFlowNode otherBranchSucc(ControlFlowNode n, boolean b) { | |||
exists(ControlFlowNode main | main = mainBranchSucc(n, b.booleanNot()) | | |||
private Node otherBranchSucc(Node n, boolean b) { |
Check warning
Code scanning / CodeQL
Missing QLDoc for parameter Warning
The QLDoc has no documentation for b, but the QLDoc mentions booleanCompletion, and normalCompletion
86804e2
to
2ca2a4b
Compare
This puts all the logic of a particular control flow node kind into one place and makes it easier to add new kinds.
Put all the ones which might need to be overrridden by subclasses together for ease of reading.
359ee98
to
aaa4361
Compare
egregius313
previously approved these changes
Dec 11, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
aschackmull
reviewed
Dec 12, 2024
It doesn't really make sense to define them in terms of dispatch.
aschackmull
approved these changes
Dec 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is built on top of #17970. That should be merged first. Only review after the commit "Undo accidental bugfix".
This PR is purely a refactoring to make the code easier to read and to make it easier to add new kinds of control flow nodes. As a guide I used the equivalent class in the go library.