infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-27 15:20:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

8381739: Comma-separated declaration with type-use annotations causes compiler crash

Browse Source 
Reviewed-by: jlahoda
This commit is contained in:
Dusan Balek 2026-04-27 09:40:33 +00:00 committed by Jan Lahoda
parent 0ba115c49f
commit 3444dad52c
2 changed files with 80 additions and 2 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/Attr.java
View File

@ -1342,9 +1342,9 @@ public class Attr extends JCTree.Visitor {
private void doQueueScanTreeAndTypeAnnotateForVarInit(JCVariableDecl tree, Env<AttrContext> env) {
if (tree.init != null &&
(tree.mods.flags & Flags.FIELD_INIT_TYPE_ANNOTATIONS_QUEUED) == 0 &&
(tree.sym.flags_field & Flags.FIELD_INIT_TYPE_ANNOTATIONS_QUEUED) == 0 &&
env.info.scope.owner.kind != MTH && env.info.scope.owner.kind != VAR) {
tree.mods.flags |= Flags.FIELD_INIT_TYPE_ANNOTATIONS_QUEUED;
tree.sym.flags_field |= Flags.FIELD_INIT_TYPE_ANNOTATIONS_QUEUED;
// Field initializer expression need to be entered.
annotate.queueScanTreeAndTypeAnnotate(tree.init, env, tree.sym);
annotate.flush();

78
test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnotatedCastsInFieldGroup.java Normal file
View File

@ -0,0 +1,78 @@
/*
* Copyright (c) 2026, 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 8381739
* @summary Verify comma-separated field declarations with type-annotated casts
* @library /tools/lib
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* @build toolbox.ToolBox toolbox.JavacTask
* @run junit ${test.main.class}
*/
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
import toolbox.JavacTask;
import toolbox.ToolBox;
public class TypeAnnotatedCastsInFieldGroup {
private Path base;
private ToolBox tb = new ToolBox();
@Test
public void testCompactDiags() throws Exception {
Path classes = base.resolve("classes");
Files.createDirectories(classes);
new JavacTask(tb)
.options("-d", classes.toString(), "-XDrawDiagnostics", "-Xdiags:compact")
.sources("""
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
class Test {
int x = (@A int) 0, y = (@A int) 1;
}
@Target({ElementType.TYPE_USE})
@interface A {}
""")
.run()
.writeAll();
}
@BeforeEach
public void setUp(TestInfo info) {
base = Paths.get(".")
.resolve(info.getTestMethod()
.orElseThrow()
.getName());
}
}