ff59532ddd
Reviewed-by: vromero
328 lines
13 KiB
Java
328 lines
13 KiB
Java
/*
|
|
* Copyright (c) 2023, 2024, 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 8301580 8322159 8333107 8332230 8338678
|
|
* @summary Verify error recovery w.r.t. Attr
|
|
* @library /tools/lib
|
|
* @enablePreview
|
|
* @modules jdk.compiler/com.sun.tools.javac.api
|
|
* jdk.compiler/com.sun.tools.javac.main
|
|
* java.base/jdk.internal.classfile.impl
|
|
* @build toolbox.ToolBox toolbox.JavacTask
|
|
* @run main AttrRecovery
|
|
*/
|
|
|
|
import com.sun.source.tree.VariableTree;
|
|
import com.sun.source.util.TaskEvent;
|
|
import com.sun.source.util.TaskListener;
|
|
import com.sun.source.util.TreePathScanner;
|
|
import com.sun.source.util.Trees;
|
|
import java.nio.file.Path;
|
|
import java.util.IdentityHashMap;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Objects;
|
|
import java.util.stream.Collectors;
|
|
import javax.lang.model.element.Element;
|
|
import javax.lang.model.element.VariableElement;
|
|
import javax.lang.model.type.DeclaredType;
|
|
import javax.lang.model.type.TypeKind;
|
|
import javax.lang.model.type.TypeMirror;
|
|
import javax.tools.Diagnostic;
|
|
|
|
import toolbox.JavacTask;
|
|
import toolbox.Task.Expect;
|
|
import toolbox.Task.OutputKind;
|
|
import toolbox.TestRunner;
|
|
import toolbox.ToolBox;
|
|
|
|
public class AttrRecovery extends TestRunner {
|
|
|
|
ToolBox tb;
|
|
|
|
public AttrRecovery() {
|
|
super(System.err);
|
|
tb = new ToolBox();
|
|
}
|
|
|
|
public static void main(String[] args) throws Exception {
|
|
AttrRecovery t = new AttrRecovery();
|
|
t.runTests();
|
|
}
|
|
|
|
@Test
|
|
public void testFlowExits() throws Exception {
|
|
String code = """
|
|
class C {
|
|
void build
|
|
{
|
|
return ;
|
|
}
|
|
}
|
|
""";
|
|
Path curPath = Path.of(".");
|
|
List<String> actual = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics", "-XDdev", "-XDshould-stop.at=FLOW")
|
|
.sources(code)
|
|
.outdir(curPath)
|
|
.run(Expect.FAIL)
|
|
.getOutputLines(OutputKind.DIRECT);
|
|
|
|
List<String> expected = List.of(
|
|
"C.java:3:5: compiler.err.expected: '('",
|
|
"C.java:4:9: compiler.err.ret.outside.meth",
|
|
"2 errors"
|
|
);
|
|
|
|
if (!Objects.equals(actual, expected)) {
|
|
error("Expected: " + expected + ", but got: " + actual);
|
|
}
|
|
}
|
|
|
|
@Test
|
|
public void testX() throws Exception {
|
|
String code = """
|
|
public class C {
|
|
public C() {
|
|
Undefined.method();
|
|
undefined1();
|
|
Runnable r = this::undefined2;
|
|
overridable(this); //to verify ThisEscapeAnalyzer has been run
|
|
}
|
|
public void overridable(C c) {}
|
|
}
|
|
""";
|
|
Path curPath = Path.of(".");
|
|
List<String> actual = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics", "-XDdev",
|
|
"-XDshould-stop.at=FLOW", "-Xlint:this-escape")
|
|
.sources(code)
|
|
.outdir(curPath)
|
|
.run(Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(OutputKind.DIRECT);
|
|
|
|
List<String> expected = List.of(
|
|
"C.java:3:9: compiler.err.cant.resolve.location: kindname.variable, Undefined, , , (compiler.misc.location: kindname.class, C, null)",
|
|
"C.java:4:9: compiler.err.cant.resolve.location.args: kindname.method, undefined1, , , (compiler.misc.location: kindname.class, C, null)",
|
|
"C.java:5:22: compiler.err.invalid.mref: kindname.method, (compiler.misc.cant.resolve.location.args: kindname.method, undefined2, , , (compiler.misc.location: kindname.class, C, null))",
|
|
"C.java:6:20: compiler.warn.possible.this.escape",
|
|
"3 errors",
|
|
"1 warning"
|
|
);
|
|
|
|
if (!Objects.equals(actual, expected)) {
|
|
error("Expected: " + expected + ", but got: " + actual);
|
|
}
|
|
}
|
|
|
|
@Test //JDK-8332230
|
|
public void testAnnotationsInErroneousTree1() throws Exception {
|
|
String code = """
|
|
package p;
|
|
public class C {
|
|
static int v;
|
|
public void t() {
|
|
//not a statement expression,
|
|
//will be wrapped in an erroneous tree:
|
|
p.@Ann C.v;
|
|
}
|
|
@interface Ann {}
|
|
}
|
|
""";
|
|
Path curPath = Path.of(".");
|
|
List<String> actual = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics", "-XDdev", "-XDshould-stop.at=FLOW")
|
|
.sources(code)
|
|
.outdir(curPath)
|
|
.run(Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(OutputKind.DIRECT);
|
|
|
|
List<String> expected = List.of(
|
|
"C.java:7:17: compiler.err.not.stmt",
|
|
"1 error"
|
|
);
|
|
|
|
if (!Objects.equals(actual, expected)) {
|
|
error("Expected: " + expected + ", but got: " + actual);
|
|
}
|
|
}
|
|
|
|
@Test //JDK-8333107
|
|
public void testNestedLambda() throws Exception {
|
|
String code = """
|
|
public class Dummy {
|
|
private void main() {
|
|
Stream l = null;
|
|
l.map(a -> {
|
|
l.map(b -> {
|
|
return null;
|
|
});
|
|
l.map(new FI() {
|
|
public String convert(String s) {
|
|
return null;
|
|
}
|
|
});
|
|
class Local {}
|
|
});
|
|
}
|
|
public interface Stream {
|
|
public void map(FI fi);
|
|
}
|
|
public interface FI {
|
|
public String convert(String s);
|
|
}
|
|
}
|
|
""";
|
|
Path curPath = Path.of(".");
|
|
List<String> actual = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics", "-XDdev",
|
|
"-XDshould-stop.at=FLOW")
|
|
.sources(code)
|
|
.outdir(curPath)
|
|
.run(Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(OutputKind.DIRECT);
|
|
|
|
List<String> expected = List.of(
|
|
"Dummy.java:4:10: compiler.err.cant.apply.symbol: kindname.method, map, Dummy.FI, @15, kindname.interface, Dummy.Stream, (compiler.misc.no.conforming.assignment.exists: (compiler.misc.incompatible.ret.type.in.lambda: (compiler.misc.missing.ret.val: java.lang.String)))",
|
|
"1 error"
|
|
);
|
|
|
|
if (!Objects.equals(actual, expected)) {
|
|
error("Expected: " + expected + ", but got: " + actual);
|
|
}
|
|
}
|
|
|
|
@Test
|
|
public void testErroneousTarget() throws Exception {
|
|
String code = """
|
|
public class C {
|
|
public Undefined g(Undefined u) {
|
|
return switch (0) {
|
|
default -> u;
|
|
};
|
|
}
|
|
}
|
|
""";
|
|
Path curPath = Path.of(".");
|
|
List<String> actual = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics")
|
|
.sources(code)
|
|
.outdir(curPath)
|
|
.run(Expect.FAIL, 1)
|
|
.writeAll()
|
|
.getOutputLines(OutputKind.DIRECT);
|
|
|
|
List<String> expected = List.of(
|
|
"C.java:2:24: compiler.err.cant.resolve.location: kindname.class, Undefined, , , (compiler.misc.location: kindname.class, C, null)",
|
|
"C.java:2:12: compiler.err.cant.resolve.location: kindname.class, Undefined, , , (compiler.misc.location: kindname.class, C, null)",
|
|
"2 errors"
|
|
);
|
|
|
|
if (!Objects.equals(actual, expected)) {
|
|
error("Expected: " + expected + ", but got: " + actual);
|
|
}
|
|
}
|
|
|
|
@Test
|
|
public void testParameterizedErroneousType() throws Exception {
|
|
String code = """
|
|
public class C {
|
|
Undefined1<Undefined2, Undefined3> variable1;
|
|
}
|
|
""";
|
|
Path curPath = Path.of(".");
|
|
List<String> actual = new JavacTask(tb)
|
|
.options("-XDrawDiagnostics")
|
|
.sources(code)
|
|
.outdir(curPath)
|
|
.callback(task -> {
|
|
task.addTaskListener(new TaskListener() {
|
|
@Override
|
|
public void finished(TaskEvent e) {
|
|
Trees trees = Trees.instance(task);
|
|
|
|
if (e.getKind() == TaskEvent.Kind.ANALYZE) {
|
|
new TreePathScanner<Void, Void>() {
|
|
@Override
|
|
public Void visitVariable(VariableTree tree, Void p) {
|
|
VariableElement var = (VariableElement) trees.getElement(getCurrentPath());
|
|
|
|
trees.printMessage(Diagnostic.Kind.NOTE, type2String(var.asType()), tree, e.getCompilationUnit());
|
|
|
|
return super.visitVariable(tree, p);
|
|
}
|
|
}.scan(e.getCompilationUnit(), null);
|
|
}
|
|
}
|
|
Map<Element, Integer> identityRename = new IdentityHashMap<>();
|
|
String type2String(TypeMirror type) {
|
|
StringBuilder result = new StringBuilder();
|
|
|
|
result.append(type.getKind());
|
|
result.append(":");
|
|
result.append(type.toString());
|
|
|
|
if (type.getKind() == TypeKind.DECLARED ||
|
|
type.getKind() == TypeKind.ERROR) {
|
|
DeclaredType dt = (DeclaredType) type;
|
|
Element el = task.getTypes().asElement(dt);
|
|
result.append(":");
|
|
result.append(el.toString());
|
|
if (!dt.getTypeArguments().isEmpty()) {
|
|
result.append(dt.getTypeArguments()
|
|
.stream()
|
|
.map(tm -> type2String(tm))
|
|
.collect(Collectors.joining(", ", "<", ">")));
|
|
}
|
|
} else {
|
|
throw new AssertionError(type.getKind().name());
|
|
}
|
|
|
|
return result.toString();
|
|
}
|
|
});
|
|
})
|
|
.run(Expect.FAIL)
|
|
.writeAll()
|
|
.getOutputLines(OutputKind.DIRECT);
|
|
|
|
List<String> expected = List.of(
|
|
"C.java:2:5: compiler.err.cant.resolve.location: kindname.class, Undefined1, , , (compiler.misc.location: kindname.class, C, null)",
|
|
"C.java:2:16: compiler.err.cant.resolve.location: kindname.class, Undefined2, , , (compiler.misc.location: kindname.class, C, null)",
|
|
"C.java:2:28: compiler.err.cant.resolve.location: kindname.class, Undefined3, , , (compiler.misc.location: kindname.class, C, null)",
|
|
"C.java:2:40: compiler.note.proc.messager: ERROR:Undefined1<Undefined2,Undefined3>:Undefined1<ERROR:Undefined2:Undefined2, ERROR:Undefined3:Undefined3>",
|
|
"3 errors"
|
|
);
|
|
|
|
if (!Objects.equals(actual, expected)) {
|
|
error("Expected: " + expected + ", but got: " + actual);
|
|
}
|
|
}
|
|
|
|
}
|