infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8361445: javac crashes on unresolvable constant in @SuppressWarnings

Browse Source 
Reviewed-by: liach, asotona
Backport-of: 0bd2f9cba2118ed5a112b4c70b8ff4a1a58f21dd
This commit is contained in:
Jan Lahoda 2025-07-09 05:07:20 +00:00
parent 0e4422b284
commit 21cb2acda0
2 changed files with 119 additions and 3 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/code/Lint.java
View File

@ -530,7 +530,9 @@ public class Lint {
EnumSet<LintCategory> result = LintCategory.newEmptySet();
Attribute.Array values = (Attribute.Array)suppressWarnings.member(names.value);
for (Attribute value : values.values) {
Optional.of((String)((Attribute.Constant)value).value)
Optional.of(value)
.filter(val -> val instanceof Attribute.Constant)
.map(val -> (String) ((Attribute.Constant) val).value)
.flatMap(LintCategory::get)
.filter(lc -> lc.annotationSuppression)
.ifPresent(result::add);

118
test/langtools/tools/javac/recovery/AnnotationRecovery.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2021, 2025, 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
@ -23,7 +23,7 @@
/*
* @test
* @bug 8270139
* @bug 8270139 8361445
* @summary Verify error recovery w.r.t. annotations
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
@ -33,8 +33,10 @@
*/
import java.nio.file.Path;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import toolbox.JavacTask;
import toolbox.Task.Expect;
@ -110,4 +112,116 @@ public class AnnotationRecovery extends TestRunner {
}
}
@Test //JDK-8361445
public void testSuppressWarningsErroneousAttribute1() throws Exception {
String code = """
@SuppressWarnings(CONST)
public class Test {
public static final String CONST = "";
}
""";
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:1:19: compiler.err.cant.resolve: kindname.variable, CONST, , ",
"1 error"
);
if (!Objects.equals(actual, expected)) {
error("Expected: " + expected + ", but got: " + actual);
}
}
@Test //JDK-8361445
public void testSuppressWarningsErroneousAttribute2() throws Exception {
String code = """
@SuppressWarnings(0)
public class Test {
}
""";
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:1:19: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)",
"1 error"
);
if (!Objects.equals(actual, expected)) {
error("Expected: " + expected + ", but got: " + actual);
}
}
@Test //JDK-8361445
public void testSuppressWarningsErroneousAttribute3() throws Exception {
String[] attributeValues = {
"Test.BOOLEAN",
"Test.BYTE",
"Test.SHORT",
"Test.INT",
"Test.LONG",
"Test.FLOAT",
"Test.DOUBLE",
"Test.CHAR",
"Test.class",
"@Deprecated",
"E.A",
};
Set<String> variants = new HashSet<>();
for (String attributeValue : attributeValues) {
variants.add(attributeValue);
variants.add("{" + attributeValue + "}");
}
for (String attributeValue1 : attributeValues) {
for (String attributeValue2 : attributeValues) {
variants.add("{" + attributeValue1 + ", " + attributeValue2 + "}");
}
}
String code = """
@SuppressWarnings($ATTRIBUTE_VALUE)
public class Test {
public static final boolean BOOLEAN = false;
public static final byte BYTE = 0;
public static final short SHORT = 0;
public static final int INT = 0;
public static final long LONG = 0l;
public static final float FLOAT = 0.0;
public static final double DOUBLE = 0.0;
public static final char CHAR = '\0';
}
enum E {
A
}
""";
for (String variant : variants) {
System.out.println("current variant: " + variant);
Path curPath = Path.of(".");
List<String> actual = new JavacTask(tb)
.options("-XDrawDiagnostics", "-XDdev")
.sources(code.replace("$ATTRIBUTE_VALUE", variant))
.outdir(curPath)
.run(Expect.FAIL)
.getOutputLines(OutputKind.DIRECT);
if (actual.isEmpty() || !actual.get(actual.size() - 1).contains("error")) {
error("Incorrect actual errors: " + actual + " for variant: " + variant);
}
}
}
}