Handle yield statement case in ASTHelpers#targetType
#3737
Closed
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
hisener
commented
Jan 27, 2023
Comment on lines
+2997
to
+3033
| @Test | ||
| public void switchExpressionsYieldStatement_doesNotThrow() { | ||
| assumeTrue(RuntimeVersion.isAtLeast14()); | ||
| compilationHelper | ||
| .addSourceLines( | ||
| "Test.java", | ||
| "import java.util.function.Supplier;", | ||
| "class Test {", | ||
| " String test(String mode) {", | ||
| " return switch (mode) {", | ||
| " case \"random\" -> {", | ||
| " yield \"foo\";", | ||
| " }", | ||
| " default -> throw new IllegalArgumentException();", | ||
| " };", | ||
| " }", | ||
| "}") | ||
| .doTest(); | ||
| } | ||
|
|
||
| @Test | ||
| public void switchExpressionsMethodReference_doesNotThrow() { | ||
| assumeTrue(RuntimeVersion.isAtLeast14()); | ||
| compilationHelper | ||
| .addSourceLines( | ||
| "Test.java", | ||
| "import java.util.function.Supplier;", | ||
| "class Test {", | ||
| " Supplier<Double> test(String mode) {", | ||
| " return switch (mode) {", | ||
| " case \"random\" -> Math::random;", | ||
| " default -> throw new IllegalArgumentException();", | ||
| " };", | ||
| " }", | ||
| "}") | ||
| .doTest(); | ||
| } |
There was a problem hiding this comment.
These two cases are irrelevant for this change, but I added to make sure NPE is only related to yield AClass::methodReference.
hisener
commented
Jan 27, 2023
Comment on lines
+1727
to
1731
| Tree actualTree = null; | ||
| if (YIELD_TREE != null && YIELD_TREE.isAssignableFrom(parent.getLeaf().getClass())) { | ||
| actualTree = parent.getParentPath().getParentPath().getParentPath().getLeaf(); | ||
| } else if (CONSTANT_CASE_LABEL_TREE != null | ||
| && CONSTANT_CASE_LABEL_TREE.isAssignableFrom(parent.getLeaf().getClass())) { |
There was a problem hiding this comment.
There should be a better way of handling these. 😬
There was a problem hiding this comment.
Agree, but I think reflection is the best option we have right now.
I've been wondering if we should try to use mrjars to avoid some of the reflection, I filed an issue to track that idea: #3756
There was a problem hiding this comment.
That's a good idea! Thanks for filing the issue. 🙇
cushon
approved these changes
Feb 4, 2023
Comment on lines
+1727
to
1731
| Tree actualTree = null; | ||
| if (YIELD_TREE != null && YIELD_TREE.isAssignableFrom(parent.getLeaf().getClass())) { | ||
| actualTree = parent.getParentPath().getParentPath().getParentPath().getLeaf(); | ||
| } else if (CONSTANT_CASE_LABEL_TREE != null | ||
| && CONSTANT_CASE_LABEL_TREE.isAssignableFrom(parent.getLeaf().getClass())) { |
There was a problem hiding this comment.
Agree, but I think reflection is the best option we have right now.
I've been wondering if we should try to use mrjars to avoid some of the reflection, I filed an issue to track that idea: #3756
copybara-service bot
pushed a commit
that referenced
this pull request
Feb 4, 2023
7504736 fixes the switch expression case, but `ImmutableChecker` can still throw `NullPointerException` for the `yield` statement + method reference case. This PR handles that case, too. Fixes #3737 FUTURE_COPYBARA_INTEGRATE_REVIEW=#3737 from DataDog:halil.sener/immutable-checker-yield-case 8fd83b5 PiperOrigin-RevId: 507164093
copybara-service bot
pushed a commit
that referenced
this pull request
Feb 13, 2023
7504736 fixes the switch expression case, but `ImmutableChecker` can still throw `NullPointerException` for the `yield` statement + method reference case. This PR handles that case, too. Fixes #3737 FUTURE_COPYBARA_INTEGRATE_REVIEW=#3737 from DataDog:halil.sener/immutable-checker-yield-case 8fd83b5 PiperOrigin-RevId: 507165001
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.
7504736 fixes the switch expression case, but
ImmutableCheckercan still throwNullPointerExceptionfor theyieldstatement + method reference case. This PR handles that case, too.