Skip to content

8314578: Non-verifiable code is emitted when two guards declare pattern variables in colon-switch #15630

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

Closed
wants to merge 2 commits into from
Closed

8314578: Non-verifiable code is emitted when two guards declare pattern variables in colon-switch #15630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cb25ea
8314578: Non-verifiable code is emitted when two guards declare patte…
biboudis Sep 8, 2023
17c0425
Add test with unnamed in guard
biboudis Oct 2, 2023
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
6 changes: 3 additions & 3 deletions src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4635,11 +4635,11 @@ void checkSwitchCaseStructure(List<JCCase> cases) {
if (previousCompletessNormally &&
c.stats.nonEmpty() &&
c.labels.head instanceof JCPatternCaseLabel patternLabel &&
hasBindings(patternLabel.pat)) {
(hasBindings(patternLabel.pat) || hasBindings(c.guard))) {
log.error(c.labels.head.pos(), Errors.FlowsThroughToPattern);
} else if (c.stats.isEmpty() &&
c.labels.head instanceof JCPatternCaseLabel patternLabel &&
hasBindings(patternLabel.pat) &&
(hasBindings(patternLabel.pat) || hasBindings(c.guard)) &&
hasStatements(l.tail)) {
log.error(c.labels.head.pos(), Errors.FlowsThroughFromPattern);
}
Expand All @@ -4648,7 +4648,7 @@ void checkSwitchCaseStructure(List<JCCase> cases) {
}
}

boolean hasBindings(JCPattern p) {
boolean hasBindings(JCTree p) {
boolean[] bindings = new boolean[1];

new TreeScanner() {
Expand Down
43 changes: 43 additions & 0 deletions test/langtools/tools/javac/patterns/T8314578.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/**
* @test /nodynamiccopyright/
* @bug 8314578
* @enablePreview
* @summary Parsing of erroneous patterns succeeds
* @compile/fail/ref=T8314578.out -XDrawDiagnostics T8314578.java
*/
public class T8314578 {
record R1() {}
record R2() {}

static void test(Object o) {
switch (o) {
case R1() when o instanceof String s:
case R2() when o instanceof Integer i:
System.out.println("hello: " + i);
break;
default:
break;
}
}

static void test2(Object o) {
switch (o) {
case R1() when o instanceof String s:
System.out.println("hello: " + s);
case R2() when o instanceof Integer i:
System.out.println("hello: " + i);
break;
default:
break;
}
}

static int unnamedInGuardsOK(String s) {
return switch (s) {
case String _ when s instanceof String _ -> // should be OK
1;
default ->
-1;
};
}
}
6 changes: 6 additions & 0 deletions test/langtools/tools/javac/patterns/T8314578.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
T8314578.java:14:18: compiler.err.flows.through.from.pattern
T8314578.java:15:18: compiler.err.flows.through.to.pattern
T8314578.java:27:18: compiler.err.flows.through.to.pattern
- compiler.note.preview.filename: T8314578.java, DEFAULT
- compiler.note.preview.recompile
3 errors