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

8270139: jshell InternalError crash for import of @Repeatable followed by unresolved ref

Browse Source 
Reviewed-by: vromero
This commit is contained in:
Jan Lahoda 2021-09-22 12:52:31 +00:00
parent aefd4ac4a3
commit ba7d550c6e
3 changed files with 169 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
View File

@ -3102,7 +3102,9 @@ public class Check {
List<Pair<MethodSymbol,Attribute>> l = repeatable.values;
if (!l.isEmpty()) {
Assert.check(l.head.fst.name == names.value);
t = ((Attribute.Class)l.head.snd).getValue();
if (l.head.snd instanceof Attribute.Class) {
t = ((Attribute.Class)l.head.snd).getValue();
}
}
if (t == null) {

52
test/langtools/jdk/jshell/ErrorRecoveryTest.java Normal file
View File

@ -0,0 +1,52 @@
/*
* 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 8270139
* @summary Verify error recovery in JShell
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.javap
* jdk.jshell/jdk.internal.jshell.tool
* @library /tools/lib
* @build KullaTesting TestingInputStream ExpectedDiagnostic toolbox.ToolBox Compiler
* @run testng ErrorRecoveryTest
*/
import org.testng.annotations.Test;
import static jdk.jshell.Snippet.Status.NONEXISTENT;
import static jdk.jshell.Snippet.Status.RECOVERABLE_NOT_DEFINED;
@Test
public class ErrorRecoveryTest extends KullaTesting {
public void testExceptionErrors() {
assertEval("import java.lang.annotation.Repeatable;");
assertEval("""
@Repeatable(FooContainer.class)
@interface Foo { int value(); }
""",
ste(MAIN_SNIPPET, NONEXISTENT, RECOVERABLE_NOT_DEFINED, false, null));
}
}

114
test/langtools/tools/javac/recovery/AnnotationRecovery.java Normal file
View File

@ -0,0 +1,114 @@
/*
* 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 8270139
* @summary Verify error recovery w.r.t. annotations
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.classfile
* @build toolbox.ToolBox toolbox.JavacTask
* @run main AnnotationRecovery
*/
import java.nio.file.Path;
import java.util.List;
import java.util.Objects;
import toolbox.JavacTask;
import toolbox.Task.Expect;
import toolbox.Task.OutputKind;
import toolbox.TestRunner;
import toolbox.ToolBox;
public class AnnotationRecovery extends TestRunner {
ToolBox tb;
public AnnotationRecovery() {
super(System.err);
tb = new ToolBox();
}
public static void main(String[] args) throws Exception {
AnnotationRecovery t = new AnnotationRecovery();
t.runTests();
}
@Test
public void testRepeatableAnnotationMissingContainer() throws Exception {
String code = """
import java.lang.annotation.Repeatable;
@Repeatable(TestContainer.class)
@interface Test { int value(); }
""";
Path curPath = Path.of(".");
List<String> actual = new JavacTask(tb)
.options("-XDrawDiagnostics", "-XDdev")
.sources(code)
.outdir(curPath)
.run(Expect.FAIL)
.getOutputLines(OutputKind.DIRECT);
List<String> expected = List.of(
"Test.java:3:13: compiler.err.cant.resolve: kindname.class, TestContainer, , ",
"1 error"
);
if (!Objects.equals(actual, expected)) {
error("Expected: " + expected + ", but got: " + actual);
}
}
@Test
public void testRepeatableAnnotationWrongAttribute() throws Exception {
String code = """
import java.lang.annotation.Repeatable;
@Repeatable(wrong=TestContainer.class)
@interface Test { int value(); }
@interface TestContainer { Test value(); }
""";
Path curPath = Path.of(".");
List<String> actual = new JavacTask(tb)
.options("-XDrawDiagnostics", "-XDdev")
.sources(code)
.outdir(curPath)
.run(Expect.FAIL)
.getOutputLines(OutputKind.DIRECT);
List<String> expected = List.of(
"Test.java:3:13: compiler.err.cant.resolve.location.args: kindname.method, wrong, , , (compiler.misc.location: kindname.annotation, java.lang.annotation.Repeatable, null)",
"Test.java:3:1: compiler.err.annotation.missing.default.value: java.lang.annotation.Repeatable, value",
"2 errors"
);
if (!Objects.equals(actual, expected)) {
error("Expected: " + expected + ", but got: " + actual);
}
}
}