Add support for switch expressions in dataflow #4982
Merged
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
…dataflow # Conflicts: # dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/CFGTranslationPhaseOne.java
Missing javadoc is in NodeVisitor, which had no javadoc on methods, so I'm not adding any.
4 tasks
…-framework into switch-expressions-check
…ck into switch-expressions-dataflow
mernst
requested changes
Dec 11, 2021
SKIP-REQUIRE-JAVADOC
Outdated
| @@ -0,0 +1 @@ | |||
| Delete after merge. | |||
There was a problem hiding this comment.
Why is this file necessary? I don't see wide-ranging uninteresting edits in this pull request.
There was a problem hiding this comment.
The problem is that NodeVisitor has 80 undocumented methods. I would have to document them all to get the Javadoc test to pass. See https://github.com/typetools/checker-framework/runs/4509004521.
dataflow/src/main/java/org/checkerframework/dataflow/cfg/node/SwitchExpressionNode.java
Outdated
Show resolved
Hide resolved
dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/CFGTranslationPhaseOne.java
Outdated
Show resolved
Hide resolved
| * Build up the CFG for the switchTree. | ||
| * | ||
| * @return if the switch is a switch expression, then a {@link SwitchExpressionNode}; otherwise, | ||
| * null |
There was a problem hiding this comment.
Why is that the right thing? I guess probably because elsewhere builds all the CFG nodes for the case bodies and none is needed explicitly for the switch statement itself.
There was a problem hiding this comment.
That's right. A switch statement does not have a value so it doesn't need to have a corresponding node.
dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/CFGTranslationPhaseOne.java
Outdated
Show resolved
Hide resolved
dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/CFGTranslationPhaseOne.java
Outdated
Show resolved
Hide resolved
dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/CFGTranslationPhaseOne.java
Outdated
Show resolved
Hide resolved
dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/CFGTranslationPhaseOne.java
Outdated
Show resolved
Hide resolved
wmdietl
pushed a commit
to eisop/checker-framework
that referenced
this pull request
Dec 19, 2021
They are analyzed the same as switch statements, except that dataflow adds adds an assignment between each result expression and a dataflow-created variable at each yield statement or expression that is a result expression. The value of that dataflow-created variable is the value of the switch expression.
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.
They are analyzed the same as switch statements, except that dataflow adds adds an assignment between each result expression and a dataflow-created variable at each yield statement or expression that is a result expression. The value of that dataflow-created variable is the value of the switch expression.
This includes #4978, merge that one first.Delete SKIP-REQUIRE-JAVADOC after merging!
Fixes #2373 and fixes #4979.