1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8221580: Confusing diagnostic for assigning a static final field in a constructor

Browse Source 
Reviewed-by: vromero
This commit is contained in:
Archie L. Cobbs 2023-02-06 18:22:22 +00:00 committed by Vicente Romero
parent c129ce4660
commit 8c01b6e66b
11 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ import java.util.EnumSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import javax.lang.model.element.Modifier;
@ -390,6 +391,15 @@ public class Flags {
*/
public static final long NON_SEALED = 1L<<63; // ClassSymbols
/**
* Describe modifier flags as they migh appear in source code, i.e.,
* separated by spaces and in the order suggested by JLS 8.1.1.
*/
public static String toSource(long flags) {
return asModifierSet(flags).stream()
.map(Modifier::toString)
.collect(Collectors.joining(" "));
}
/** Modifier masks.
*/

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

@ -303,7 +303,7 @@ public class Attr extends JCTree.Visitor {
if (v.isResourceVariable()) { //TWR resource
log.error(pos, Errors.TryResourceMayNotBeAssigned(v));
} else {
log.error(pos, Errors.CantAssignValToFinalVar(v));
log.error(pos, Errors.CantAssignValToVar(Flags.toSource(v.flags() & (STATIC | FINAL)), v));
}
}
}

6
src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
View File

@ -333,9 +333,9 @@ compiler.misc.invalid.mref=\
compiler.misc.static.mref.with.targs=\
parameterized qualifier on static method reference
# 0: symbol
compiler.err.cant.assign.val.to.final.var=\
cannot assign a value to final variable {0}
# 0: set of flag or string, 1: symbol
compiler.err.cant.assign.val.to.var=\
cannot assign a value to {0} variable {1}
compiler.err.cant.assign.val.to.this=\
cannot assign to ''this''

4
test/langtools/jdk/jshell/ModifiersTest.java
View File

@ -128,9 +128,9 @@ public class ModifiersTest extends KullaTesting {
assertEval("A.y;", "18");
assertDeclareFail("A.x = 18;",
new ExpectedDiagnostic("compiler.err.cant.assign.val.to.final.var", 0, 3, 1, -1, -1, Diagnostic.Kind.ERROR));
new ExpectedDiagnostic("compiler.err.cant.assign.val.to.var", 0, 3, 1, -1, -1, Diagnostic.Kind.ERROR));
assertDeclareFail("A.y = 88;",
new ExpectedDiagnostic("compiler.err.cant.assign.val.to.final.var", 0, 3, 1, -1, -1, Diagnostic.Kind.ERROR));
new ExpectedDiagnostic("compiler.err.cant.assign.val.to.var", 0, 3, 1, -1, -1, Diagnostic.Kind.ERROR));
assertActiveKeys();
}

2
test/langtools/tools/javac/InnerNamedConstant_2_A.out
View File

@ -1,5 +1,5 @@
InnerNamedConstant_2.java:23:20: compiler.err.icls.cant.have.static.decl: InnerNamedConstant_2.Inner2
InnerNamedConstant_2.java:24:29: compiler.err.icls.cant.have.static.decl: InnerNamedConstant_2.Inner2
InnerNamedConstant_2.java:26:13: compiler.err.cant.assign.val.to.final.var: z
InnerNamedConstant_2.java:26:13: compiler.err.cant.assign.val.to.var: static final, z
InnerNamedConstant_2.java:35:26: compiler.err.icls.cant.have.static.decl: InnerNamedConstant_2.Inner3
4 errors

2
test/langtools/tools/javac/InnerNamedConstant_2_B.out
View File

@ -1,2 +1,2 @@
InnerNamedConstant_2.java:26:13: compiler.err.cant.assign.val.to.final.var: z
InnerNamedConstant_2.java:26:13: compiler.err.cant.assign.val.to.var: static final, z
1 error

4
test/langtools/tools/javac/StoreClass.out
View File

@ -1,3 +1,3 @@
StoreClass.java:12:19: compiler.err.cant.assign.val.to.final.var: class
StoreClass.java:13:12: compiler.err.cant.assign.val.to.final.var: class
StoreClass.java:12:19: compiler.err.cant.assign.val.to.var: static final, class
StoreClass.java:13:12: compiler.err.cant.assign.val.to.var: static final, class
2 errors

2
test/langtools/tools/javac/TryWithResources/BadTwr.out
View File

@ -1,5 +1,5 @@
BadTwr.java:12:46: compiler.err.already.defined: kindname.variable, r1, kindname.method, meth(java.lang.String...)
BadTwr.java:17:20: compiler.err.already.defined: kindname.variable, args, kindname.method, meth(java.lang.String...)
BadTwr.java:20:13: compiler.err.cant.assign.val.to.final.var: thatsIt
BadTwr.java:20:13: compiler.err.cant.assign.val.to.var: final, thatsIt
BadTwr.java:25:24: compiler.err.already.defined: kindname.variable, name, kindname.method, meth(java.lang.String...)
4 errors

2
test/langtools/tools/javac/diags/examples/CantAssignToFinal.java
View File

@ -21,7 +21,7 @@
* questions.
*/
// key: compiler.err.cant.assign.val.to.final.var
// key: compiler.err.cant.assign.val.to.var
class CantAssignToFinal {
final int i = 0;

2
test/langtools/tools/javac/patterns/BindingsTest2.out
View File

@ -46,7 +46,7 @@ BindingsTest2.java:212:13: compiler.err.cant.resolve.location: kindname.variable
BindingsTest2.java:221:17: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
BindingsTest2.java:231:17: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
BindingsTest2.java:241:17: compiler.err.cant.resolve.location: kindname.variable, s, , , (compiler.misc.location: kindname.class, BindingsTest2, null)
BindingsTest2.java:247:17: compiler.err.cant.assign.val.to.final.var: s
BindingsTest2.java:247:17: compiler.err.cant.assign.val.to.var: final, s
BindingsTest2.java:135:17: compiler.err.unreachable.stmt
BindingsTest2.java:160:17: compiler.err.unreachable.stmt
BindingsTest2.java:185:17: compiler.err.unreachable.stmt

4
test/langtools/tools/javac/records/RecordCompilationTests.java
View File

@ -2028,7 +2028,7 @@ public class RecordCompilationTests extends CompilationTestCase {
}
public void testNoAssigmentInsideCompactRecord() {
assertFail("compiler.err.cant.assign.val.to.final.var",
assertFail("compiler.err.cant.assign.val.to.var",
"""
record R(int i) {
R {
@ -2037,7 +2037,7 @@ public class RecordCompilationTests extends CompilationTestCase {
}
"""
);
assertFail("compiler.err.cant.assign.val.to.final.var",
assertFail("compiler.err.cant.assign.val.to.var",
"""
record R(int i) {
R {