stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8234922: No compilation error reported not reported for a binding variable when loop broken with label

Browse Source 
Any break outside of a loop should confine the binding variables from the loop's condition to the loop

Reviewed-by: mcimadamore
This commit is contained in:
Jan Lahoda 2019-12-04 09:38:32 +01:00
parent f26bdf8476
commit 07be23513b
5 changed files with 353 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Flow.java
View File

@ -280,8 +280,7 @@ public class Flow {
//related errors, which will allow for more errors to be detected
Log.DiagnosticHandler diagHandler = new Log.DiscardDiagnosticHandler(log);
try {
boolean[] breaksOut = new boolean[1];
SnippetBreakAnalyzer analyzer = new SnippetBreakAnalyzer(loop);
SnippetBreakAnalyzer analyzer = new SnippetBreakAnalyzer();
analyzer.analyzeTree(env, body, make);
return analyzer.breaksOut();
@ -1515,16 +1514,46 @@ public class Flow {
}
class SnippetBreakAnalyzer extends AliveAnalyzer {
private final JCTree loop;
private final Set<JCTree> seenTrees = new HashSet<>();
private boolean breaksOut;
public SnippetBreakAnalyzer(JCTree loop) {
this.loop = loop;
public SnippetBreakAnalyzer() {
}
@Override
public void visitLabelled(JCTree.JCLabeledStatement tree) {
seenTrees.add(tree);
super.visitLabelled(tree);
}
@Override
public void visitWhileLoop(JCTree.JCWhileLoop tree) {
seenTrees.add(tree);
super.visitWhileLoop(tree);
}
@Override
public void visitForLoop(JCTree.JCForLoop tree) {
seenTrees.add(tree);
super.visitForLoop(tree);
}
@Override
public void visitForeachLoop(JCTree.JCEnhancedForLoop tree) {
seenTrees.add(tree);
super.visitForeachLoop(tree);
}
@Override
public void visitDoLoop(JCTree.JCDoWhileLoop tree) {
seenTrees.add(tree);
super.visitDoLoop(tree);
}
@Override
public void visitBreak(JCBreak tree) {
breaksOut |= (super.alive == Liveness.ALIVE && tree.target == loop);
breaksOut |= (super.alive == Liveness.ALIVE &&
!seenTrees.contains(tree.target));
super.visitBreak(tree);
}

24
test/langtools/tools/javac/patterns/BindingsTest1.java
View File

@ -146,6 +146,30 @@ public class BindingsTest1 {
s.length();
}
{
while (!(o1 instanceof String s)) {
L8: break L8;
}
s.length();
}
{
for ( ;!(o1 instanceof String s); ) {
L9: break L9;
}
s.length();
}
{
do {
L10: break L10;
} while (!(o1 instanceof String s));
s.length();
}
if (o1 instanceof String s) {
Runnable r1 = new Runnable() {
@Override

54
test/langtools/tools/javac/patterns/BindingsTest2.java
View File

@ -187,5 +187,59 @@ public class BindingsTest2 {
s.length();
}
{
L: while (!(o1 instanceof String s)) {
break L;
}
s.length();
}
{
L: for (; !(o1 instanceof String s); ) {
break L;
}
s.length();
}
{
L: do {
break L;
} while (!(o1 instanceof String s));
s.length();
}
{
L: {
while (!(o1 instanceof String s)) {
break L;
}
s.length();
}
}
{
L: {
for (; !(o1 instanceof String s); ) {
break L;
}
s.length();
}
}
{
L: {
do {
break L;
} while (!(o1 instanceof String s));
s.length();
}
}
}
}

8
test/langtools/tools/javac/patterns/BindingsTest2.out
View File

@ -40,9 +40,15 @@ BindingsTest2.java:146:13: compiler.err.cant.resolve.location: kindname.variable
BindingsTest2.java:154:13: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
BindingsTest2.java:171:13: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
BindingsTest2.java:179:13: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
BindingsTest2.java:196:13: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
BindingsTest2.java:204:13: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
BindingsTest2.java:212:13: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
BindingsTest2.java:221:17: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
BindingsTest2.java:231:17: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
BindingsTest2.java:241:17: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
BindingsTest2.java:135:17: compiler.err.unreachable.stmt
BindingsTest2.java:160:17: compiler.err.unreachable.stmt
BindingsTest2.java:185:17: compiler.err.unreachable.stmt
- compiler.note.preview.filename: BindingsTest2.java
- compiler.note.preview.recompile
45 errors
51 errors

233
test/langtools/tools/javac/patterns/BreakAndLoops.java Normal file
View File

@ -0,0 +1,233 @@
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 8234922
* @summary Verify proper scope of binding related to loops and breaks.
* @library /tools/lib /tools/javac/lib
* @modules
* java.base/jdk.internal
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* @build toolbox.ToolBox toolbox.JavacTask
* @build combo.ComboTestHelper
* @compile --enable-preview -source ${jdk.version} BreakAndLoops.java
* @run main/othervm --enable-preview BreakAndLoops
*/
import combo.ComboInstance;
import combo.ComboParameter;
import combo.ComboTask;
import combo.ComboTestHelper;
import java.nio.file.Path;
import java.nio.file.Paths;
import toolbox.ToolBox;
public class BreakAndLoops extends ComboInstance<BreakAndLoops> {
protected ToolBox tb;
BreakAndLoops() {
super();
tb = new ToolBox();
}
public static void main(String... args) throws Exception {
new ComboTestHelper<BreakAndLoops>()
.withDimension("OUTTER_LABEL", (x, outterLabel) -> x.outterLabel = outterLabel, OutterLabel.values())
.withDimension("OUTTER_LOOP", (x, outterLoop) -> x.outterLoop = outterLoop, OutterLoop.values())
.withDimension("MAIN_LOOP", (x, mainLoop) -> x.mainLoop = mainLoop, MainLoop.values())
.withDimension("INNER_LABEL", (x, innerLabel) -> x.innerLabel = innerLabel, Label.values())
.withDimension("INNER_LOOP", (x, innerLoop) -> x.innerLoop = innerLoop, Loop.values())
.withDimension("BREAK", (x, brk) -> x.brk = brk, Break.values())
.withFilter(bal -> bal.outterLabel != OutterLabel.LABEL || bal.innerLabel != Label.LABEL)
.run(BreakAndLoops::new);
}
private OutterLabel outterLabel;
private OutterLoop outterLoop;
private MainLoop mainLoop;
private Label innerLabel;
private Loop innerLoop;
private Break brk;
private static final String MAIN_TEMPLATE =
"""
public class Test {
public static void doTest(Object o, int i, Object[] arr) {
#{OUTTER_LABEL}
}
}
""";
@Override
protected void doWork() throws Throwable {
Path base = Paths.get(".");
ComboTask task = newCompilationTask()
.withSourceFromTemplate(MAIN_TEMPLATE, pname -> switch (pname) {
case "OUTTER_LABEL" -> outterLabel;
case "OUTTER_LOOP" -> outterLoop;
case "MAIN_LOOP" -> mainLoop;
case "NESTED_LOOP" -> innerLoop;
case "NESTED" -> brk;
case "BODY" -> innerLabel;
default -> throw new UnsupportedOperationException(pname);
})
.withOption("--enable-preview")
.withOption("-source")
.withOption(String.valueOf(Runtime.version().feature()));
task.generate(result -> {
boolean shouldPass;
if (brk == Break.NONE) {
shouldPass = true;
} else if (innerLabel == Label.LABEL && brk == Break.BREAK_LABEL) {
shouldPass = true;
} else if (innerLoop.supportsAnonymousBreak && brk == Break.BREAK) {
shouldPass = true;
} else {
shouldPass = false;
}
if (!(shouldPass ^ result.hasErrors())) {
throw new AssertionError("Unexpected result: " + result.compilationInfo());
}
});
}
public enum MainLoop implements ComboParameter {
WHILE("""
while (!(o instanceof String s)) {
#{BODY}
}
"""),
FOR("""
for( ; !(o instanceof String s) ; ) {
#{BODY}
}
"""),
DO_WHILE("""
do {
#{BODY}
} while (!(o instanceof String s));
""");
private final String body;
private MainLoop(String body) {
this.body = body;
}
@Override
public String expand(String optParameter) {
return body;
}
}
public enum OutterLabel implements ComboParameter {
NONE("#{OUTTER_LOOP}"),
LABEL("LABEL: #{OUTTER_LOOP}");
private final String code;
private OutterLabel(String code) {
this.code = code;
}
@Override
public String expand(String optParameter) {
return code;
}
}
public enum OutterLoop implements ComboParameter {
NONE("#{MAIN_LOOP} System.err.println(s);"),
BLOCK("{ #{MAIN_LOOP} System.err.println(s); }"),
WHILE("while (i-- > 0) { #{MAIN_LOOP} System.err.println(s); }"),
FOR("for ( ; i-- > 0; ) { #{MAIN_LOOP} System.err.println(s); }"),
FOR_EACH("for (Object outterO : arr) { #{MAIN_LOOP} System.err.println(s); }"),
DO_WHILE("do { #{MAIN_LOOP} System.err.println(s); } while (i-- > 0);");
private final String code;
private OutterLoop(String code) {
this.code = code;
}
@Override
public String expand(String optParameter) {
return code;
}
}
public enum Label implements ComboParameter {
NONE("#{NESTED_LOOP}"),
LABEL("LABEL: #{NESTED_LOOP}");
private final String code;
private Label(String code) {
this.code = code;
}
@Override
public String expand(String optParameter) {
return code;
}
}
public enum Loop implements ComboParameter {
NONE("#{NESTED}", false),
BLOCK("{ #{NESTED} }", false),
WHILE("while (i-- > 0) { #{NESTED} }", true),
FOR("for ( ; i-- > 0; ) { #{NESTED} }", true),
FOR_EACH("for (Object innerO : arr) { #{NESTED} }", true),
DO_WHILE("do { #{NESTED} } while (i-- > 0);", true);
private final String code;
private final boolean supportsAnonymousBreak;
private Loop(String code, boolean supportsAnonymousBreak) {
this.code = code;
this.supportsAnonymousBreak = supportsAnonymousBreak;
}
@Override
public String expand(String optParameter) {
return code;
}
}
public enum Break implements ComboParameter {
NONE(";"),
BREAK("break;"),
BREAK_LABEL("break LABEL;");
private final String code;
private Break(String code) {
this.code = code;
}
@Override
public String expand(String optParameter) {
return code;
}
}
}