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

8273039: JShell crashes when naming variable or method "abstract" or "strictfp"

Browse Source 
Reviewed-by: vromero
This commit is contained in:
Jan Lahoda 2021-11-19 07:49:58 +00:00
parent f34f119080
commit 2f20b0d8da
3 changed files with 182 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
View File

@ -5098,6 +5098,14 @@ public class Attr extends JCTree.Visitor {
Assert.error("should be handled in annotate");
}
@Override
public void visitModifiers(JCModifiers tree) {
//error recovery only:
Assert.check(resultInfo.pkind == KindSelector.ERR);
attribAnnotationTypes(tree.annotations, env);
}
public void visitAnnotatedType(JCAnnotatedType tree) {
attribAnnotationTypes(tree.annotations, env);
Type underlyingType = attribType(tree.underlyingType, env);

10
test/langtools/jdk/jshell/ErrorRecoveryTest.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 8270139
* @bug 8270139 8273039
* @summary Verify error recovery in JShell
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
@ -37,6 +37,7 @@
import org.testng.annotations.Test;
import static jdk.jshell.Snippet.Status.NONEXISTENT;
import static jdk.jshell.Snippet.Status.RECOVERABLE_NOT_DEFINED;
import static jdk.jshell.Snippet.Status.REJECTED;
@Test
public class ErrorRecoveryTest extends KullaTesting {
@ -49,4 +50,11 @@ public class ErrorRecoveryTest extends KullaTesting {
""",
ste(MAIN_SNIPPET, NONEXISTENT, RECOVERABLE_NOT_DEFINED, false, null));
}
public void testBrokenName() {
assertEval("int strictfp = 0;",
DiagCheck.DIAG_ERROR,
DiagCheck.DIAG_IGNORE,
ste(MAIN_SNIPPET, NONEXISTENT, REJECTED, false, null));
}
}

165
test/langtools/tools/javac/attr/AttrRecoveryTest.java Normal file
View File

@ -0,0 +1,165 @@
/*
* Copyright (c) 2021, 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 8273039
* @summary Verify error recovery in Attr
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.util
* @build toolbox.ToolBox toolbox.JavacTask
* @run main AttrRecoveryTest
*/
import com.sun.source.tree.AnnotationTree;
import com.sun.source.tree.CompilationUnitTree;
import com.sun.source.tree.ErroneousTree;
import com.sun.source.util.TaskEvent;
import com.sun.source.util.TaskListener;
import com.sun.source.util.TreePath;
import com.sun.source.util.TreePathScanner;
import com.sun.source.util.Trees;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import javax.lang.model.element.Element;
import toolbox.TestRunner;
import toolbox.JavacTask;
import toolbox.Task;
import toolbox.ToolBox;
public class AttrRecoveryTest extends TestRunner {
ToolBox tb;
public static void main(String... args) throws Exception {
new AttrRecoveryTest().runTests();
}
AttrRecoveryTest() {
super(System.err);
tb = new ToolBox();
}
public void runTests() throws Exception {
runTests(m -> new Object[] { Paths.get(m.getName()) });
}
@Test
public void testModifiers(Path base) throws Exception {
record TestCase(String name, String source, String expectedAnnotation, String... errors) {}
TestCase[] tests = new TestCase[] {
new TestCase("a",
"""
public class Test {
Object i () { return int strictfp @Deprecated = 0; }
}
""",
"java.lang.Deprecated",
"Test.java:2:30: compiler.err.dot.class.expected",
"Test.java:2:51: compiler.err.expected4: class, interface, enum, record",
"Test.java:2:26: compiler.err.unexpected.type: kindname.value, kindname.class",
"3 errors"),
new TestCase("b",
"""
public class Test {
Object i () { return int strictfp = 0; }
}
""",
null,
"Test.java:2:30: compiler.err.dot.class.expected",
"Test.java:2:39: compiler.err.expected4: class, interface, enum, record",
"Test.java:2:26: compiler.err.unexpected.type: kindname.value, kindname.class",
"3 errors")
};
for (TestCase test : tests) {
Path current = base.resolve("" + test.name);
Path src = current.resolve("src");
Path classes = current.resolve("classes");
tb.writeJavaFiles(src,
test.source);
Files.createDirectories(classes);
var log =
new JavacTask(tb)
.options("-XDrawDiagnostics",
"-XDshould-stop.at=FLOW",
"-Xlint:-preview")
.outdir(classes)
.files(tb.findJavaFiles(src))
.callback(t -> {
t.addTaskListener(new TaskListener() {
CompilationUnitTree parsed;
@Override
public void finished(TaskEvent e) {
switch (e.getKind()) {
case PARSE -> parsed = e.getCompilationUnit();
case ANALYZE ->
checkAnnotationsValid(t, parsed, test.expectedAnnotation);
}
}
});
})
.run(Task.Expect.FAIL, 1)
.writeAll()
.getOutputLines(Task.OutputKind.DIRECT);
if (!List.of(test.errors).equals(log)) {
throw new AssertionError("Incorrect errors, expected: " + List.of(test.errors) +
", actual: " + log);
}
}
}
private void checkAnnotationsValid(com.sun.source.util.JavacTask task,
CompilationUnitTree cut,
String expected) {
boolean[] foundAnnotation = new boolean[1];
Trees trees = Trees.instance(task);
new TreePathScanner<Void, Void>() {
@Override
public Void visitAnnotation(AnnotationTree node, Void p) {
TreePath typePath = new TreePath(getCurrentPath(), node.getAnnotationType());
Element el = trees.getElement(typePath);
if (el == null || !el.equals(task.getElements().getTypeElement(expected))) {
throw new AssertionError();
}
foundAnnotation[0] = true;
return super.visitAnnotation(node, p);
}
@Override
public Void visitErroneous(ErroneousTree node, Void p) {
return scan(node.getErrorTrees(), p);
}
}.scan(cut, null);
if (foundAnnotation[0] ^ (expected != null)) {
throw new AssertionError();
}
}
}