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

8346751: Internal java compiler error with type annotations in constants expression in constant fields

Browse Source 
Reviewed-by: vromero
This commit is contained in:
Jan Lahoda 2025-01-24 08:12:50 +00:00
parent 2daafe49c7
commit 0395593a8a
5 changed files with 106 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 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
@ -399,6 +399,11 @@ public class Flags {
*/
public static final long RESTRICTED = 1L<<62; // MethodSymbols
/**
* Flag to indicate type annotations have been queued for field initializers.
*/
public static final long FIELD_INIT_TYPE_ANNOTATIONS_QUEUED = 1L<<53; // VarSymbols
/**
* Flag to indicate that the class/interface was declared with the non-sealed modifier.
*/

5
src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 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
@ -1788,10 +1788,11 @@ public abstract class Symbol extends AnnoConstruct implements PoolConstant, Elem
}
public void setLazyConstValue(final Env<AttrContext> env,
final Env<AttrContext> enclosingEnv,
final Attr attr,
final JCVariableDecl variable)
{
setData((Callable<Object>)() -> attr.attribLazyConstantValue(env, variable, type));
setData((Callable<Object>)() -> attr.attribLazyConstantValue(env, enclosingEnv, variable, type));
}
/**

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

@ -851,6 +851,7 @@ public class Attr extends JCTree.Visitor {
* @see VarSymbol#setLazyConstValue
*/
public Object attribLazyConstantValue(Env<AttrContext> env,
Env<AttrContext> enclosingEnv,
JCVariableDecl variable,
Type type) {
@ -859,6 +860,7 @@ public class Attr extends JCTree.Visitor {
final JavaFileObject prevSource = log.useSource(env.toplevel.sourcefile);
try {
doQueueScanTreeAndTypeAnnotateForVarInit(variable, enclosingEnv);
Type itype = attribExpr(variable.init, env, type);
if (variable.isImplicitlyTyped()) {
//fixup local variable type
@ -1282,11 +1284,7 @@ public class Attr extends JCTree.Visitor {
}
}
} else {
if (tree.init != null) {
// Field initializer expression need to be entered.
annotate.queueScanTreeAndTypeAnnotate(tree.init, env, tree.sym, tree.pos());
annotate.flush();
}
doQueueScanTreeAndTypeAnnotateForVarInit(tree, env);
}
VarSymbol v = tree.sym;
@ -1339,6 +1337,17 @@ 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 &&
env.info.scope.owner.kind != MTH && env.info.scope.owner.kind != VAR) {
tree.mods.flags |= Flags.FIELD_INIT_TYPE_ANNOTATIONS_QUEUED;
// Field initializer expression need to be entered.
annotate.queueScanTreeAndTypeAnnotate(tree.init, env, tree.sym, tree.pos());
annotate.flush();
}
}
private boolean isNonArgsMethodInObject(Name name) {
for (Symbol s : syms.objectType.tsym.members().getSymbolsByName(name, s -> s.kind == MTH)) {
if (s.type.getParameterTypes().isEmpty()) {

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 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
@ -301,7 +301,7 @@ public class MemberEnter extends JCTree.Visitor {
needsLazyConstValue(tree.init)) {
Env<AttrContext> initEnv = getInitEnv(tree, env);
initEnv.info.enclVar = v;
v.setLazyConstValue(initEnv(tree, initEnv), attr, tree);
v.setLazyConstValue(initEnv(tree, initEnv), env, attr, tree);
}
}

81
test/langtools/tools/javac/annotations/typeAnnotations/TypeAnnotationsInConstantInit.java Normal file
View File

@ -0,0 +1,81 @@
/*
* Copyright (c) 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
* 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 8346751
* @summary Verify type annotations inside constant expression field initializers
are handled correctly
* @library /tools/lib
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.util
* @build toolbox.ToolBox toolbox.JavacTask
* @run main TypeAnnotationsInConstantInit
*/
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import toolbox.JavacTask;
import toolbox.ToolBox;
public class TypeAnnotationsInConstantInit {
public static void main(String... args) throws Exception {
new TypeAnnotationsInConstantInit().run();
}
ToolBox tb = new ToolBox();
void run() throws Exception {
typeAnnotationInConstantExpressionFieldInit(Paths.get("."));
}
void typeAnnotationInConstantExpressionFieldInit(Path base) throws Exception {
Path src = base.resolve("src");
Path classes = base.resolve("classes");
tb.writeJavaFiles(src,
"""
import java.lang.annotation.*;
@SuppressWarnings(Decl.VALUE)
public class Decl {
public static final @Nullable String VALUE = (@Nullable String) "";
}
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE_USE })
@interface Nullable {}
""");
Files.createDirectories(classes);
new JavacTask(tb)
.options("-d", classes.toString())
.files(tb.findJavaFiles(src))
.run()
.writeAll();
}
}