Java: Make separate classes for different control flow node kinds #17996
+497
−343
Conversation
This file contains 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
Only one in Dominance required thinking.
now we need to sort out range analysis
The equivalence relation needed for range analysis is now on underlying `ExprParent`s, as `BasicBlock` is now an IPA type and ids are opaque.
Java: some mechanical transformations
Fix is taken from https://github.com/github/codeql/pull/711/files#diff-24d21bcfe63e29a6ef28151d9bd8eeaa610565c3ed7b846de1eb5fb0be661ae5 It is not clear why anotations are left out.
Java: fix UnreachabaleBasicBlock
This is unrelated to the main purpose of this PR. I have made a separate PR to do it here: github#17988
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| result = this.(Expr).getEnclosingStmt() | ||
| } | ||
|
|
||
| Node getCFGNode() { result.asExpr() = this or result.asStmt() = this } |
Check warning
Code scanning / CodeQL
Acronyms should be PascalCase/camelCase. Warning
| 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
| @@ -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
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.
owen-mc
force-pushed
the
java/lightweight-IR-layer-classes
branch
from
86804e2
to
2ca2a4b
Compare
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.