8254105: allow static nested declarations

Vicente Romero · Vicente Romero · commit 9a19eb6918e1 · 2020-11-21T03:17:57.000Z
Reviewed-by: mcimadamore
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java
@@ -383,30 +383,31 @@ public static EnumSet<Flag> asFlagSet(long flags) {
     /** Modifier masks.
      */
     public static final int
-        AccessFlags           = PUBLIC | PROTECTED | PRIVATE,
-        LocalClassFlags       = FINAL | ABSTRACT | STRICTFP | ENUM | SYNTHETIC,
-        StaticLocalFlags      = LocalClassFlags | STATIC | INTERFACE,
-        MemberClassFlags      = LocalClassFlags | INTERFACE | AccessFlags,
-        MemberRecordFlags     = MemberClassFlags | STATIC,
-        ClassFlags            = LocalClassFlags | INTERFACE | PUBLIC | ANNOTATION,
-        InterfaceVarFlags     = FINAL | STATIC | PUBLIC,
-        VarFlags              = AccessFlags | FINAL | STATIC |
-                                VOLATILE | TRANSIENT | ENUM,
-        ConstructorFlags      = AccessFlags,
-        InterfaceMethodFlags  = ABSTRACT | PUBLIC,
-        MethodFlags           = AccessFlags | ABSTRACT | STATIC | NATIVE |
-                                SYNCHRONIZED | FINAL | STRICTFP,
-        RecordMethodFlags     = AccessFlags | ABSTRACT | STATIC |
-                                SYNCHRONIZED | FINAL | STRICTFP;
+        AccessFlags                       = PUBLIC | PROTECTED | PRIVATE,
+        LocalClassFlags                   = FINAL | ABSTRACT | STRICTFP | ENUM | SYNTHETIC,
+        StaticLocalFlags                  = LocalClassFlags | STATIC | INTERFACE,
+        MemberClassFlags                  = LocalClassFlags | INTERFACE | AccessFlags,
+        MemberStaticClassFlags            = MemberClassFlags | STATIC,
+        ClassFlags                        = LocalClassFlags | INTERFACE | PUBLIC | ANNOTATION,
+        InterfaceVarFlags                 = FINAL | STATIC | PUBLIC,
+        VarFlags                          = AccessFlags | FINAL | STATIC |
+                                            VOLATILE | TRANSIENT | ENUM,
+        ConstructorFlags                  = AccessFlags,
+        InterfaceMethodFlags              = ABSTRACT | PUBLIC,
+        MethodFlags                       = AccessFlags | ABSTRACT | STATIC | NATIVE |
+                                            SYNCHRONIZED | FINAL | STRICTFP,
+        RecordMethodFlags                 = AccessFlags | ABSTRACT | STATIC |
+                                            SYNCHRONIZED | FINAL | STRICTFP;
     public static final long
-        ExtendedStandardFlags       = (long)StandardFlags | DEFAULT | SEALED | NON_SEALED,
-        ExtendedMemberClassFlags    = (long)MemberClassFlags | SEALED | NON_SEALED,
-        ExtendedClassFlags          = (long)ClassFlags | SEALED | NON_SEALED,
-        ModifierFlags               = ((long)StandardFlags & ~INTERFACE) | DEFAULT | SEALED | NON_SEALED,
-        InterfaceMethodMask         = ABSTRACT | PRIVATE | STATIC | PUBLIC | STRICTFP | DEFAULT,
-        AnnotationTypeElementMask   = ABSTRACT | PUBLIC,
-        LocalVarFlags               = FINAL | PARAMETER,
-        ReceiverParamFlags          = PARAMETER;
+        ExtendedStandardFlags             = (long)StandardFlags | DEFAULT | SEALED | NON_SEALED,
+        ExtendedMemberClassFlags          = (long)MemberClassFlags | SEALED | NON_SEALED,
+        ExtendedMemberStaticClassFlags    = (long) MemberStaticClassFlags | SEALED | NON_SEALED,
+        ExtendedClassFlags                = (long)ClassFlags | SEALED | NON_SEALED,
+        ModifierFlags                     = ((long)StandardFlags & ~INTERFACE) | DEFAULT | SEALED | NON_SEALED,
+        InterfaceMethodMask               = ABSTRACT | PRIVATE | STATIC | PUBLIC | STRICTFP | DEFAULT,
+        AnnotationTypeElementMask         = ABSTRACT | PUBLIC,
+        LocalVarFlags                     = FINAL | PARAMETER,
+        ReceiverParamFlags                = PARAMETER;
 
     @SuppressWarnings("preview")
     public static Set<Modifier> asModifierSet(long flags) {
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -171,6 +171,7 @@ protected Attr(Context context) {
         allowReifiableTypesInInstanceof =
                 Feature.REIFIABLE_TYPES_INSTANCEOF.allowedInSource(source) &&
                 (!preview.isPreview(Feature.REIFIABLE_TYPES_INSTANCEOF) || preview.isEnabled());
+        allowRecords = Feature.RECORDS.allowedInSource(source);
         sourceName = source.name;
         useBeforeDeclarationWarning = options.isSet("useBeforeDeclarationWarning");
 
@@ -207,6 +208,10 @@ protected Attr(Context context) {
      */
     boolean allowReifiableTypesInInstanceof;
 
+    /** Are records allowed
+     */
+    private final boolean allowRecords;
+
     /**
      * Switch: warn about use of variable before declaration?
      * RFE: 6425594
@@ -5309,14 +5314,15 @@ private void attribClassBody(Env<AttrContext> env, ClassSymbol c) {
             attribStat(l.head, env);
             // Check that declarations in inner classes are not static (JLS 8.1.2)
             // Make an exception for static constants.
-            if (c.owner.kind != PCK &&
-                ((c.flags() & STATIC) == 0 || c.name == names.empty) &&
-                (TreeInfo.flags(l.head) & (STATIC | INTERFACE)) != 0) {
+            if (!allowRecords &&
+                    c.owner.kind != PCK &&
+                    ((c.flags() & STATIC) == 0 || c.name == names.empty) &&
+                    (TreeInfo.flags(l.head) & (STATIC | INTERFACE)) != 0) {
                 Symbol sym = null;
                 if (l.head.hasTag(VARDEF)) sym = ((JCVariableDecl) l.head).sym;
                 if (sym == null ||
-                    sym.kind != VAR ||
-                    ((VarSymbol) sym).getConstValue() == null)
+                        sym.kind != VAR ||
+                        ((VarSymbol) sym).getConstValue() == null)
                     log.error(l.head.pos(), Errors.IclsCantHaveStaticDecl(c));
             }
         }
diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java
@@ -1216,23 +1216,20 @@ else if ((sym.owner.flags_field & INTERFACE) != 0)
                 implicit |= sym.owner.flags_field & STRICTFP;
             break;
         case TYP:
-            if (sym.isLocal()) {
+            if (sym.owner.kind.matches(KindSelector.VAL_MTH)) {
                 boolean implicitlyStatic = !sym.isAnonymous() &&
                         ((flags & RECORD) != 0 || (flags & ENUM) != 0 || (flags & INTERFACE) != 0);
                 boolean staticOrImplicitlyStatic = (flags & STATIC) != 0 || implicitlyStatic;
+                // local statics are allowed only if records are allowed too
                 mask = staticOrImplicitlyStatic && allowRecords && (flags & ANNOTATION) == 0 ? StaticLocalFlags : LocalClassFlags;
                 implicit = implicitlyStatic ? STATIC : implicit;
-                if (staticOrImplicitlyStatic) {
-                    if (sym.owner.kind == TYP) {
-                        log.error(pos, Errors.StaticDeclarationNotAllowedInInnerClasses);
-                    }
-                }
             } else if (sym.owner.kind == TYP) {
-                mask = (flags & RECORD) != 0 ? MemberRecordFlags : ExtendedMemberClassFlags;
+                // statics in inner classes are allowed only if records are allowed too
+                mask = ((flags & STATIC) != 0) && allowRecords ? ExtendedMemberStaticClassFlags : ExtendedMemberClassFlags;
                 if (sym.owner.owner.kind == PCK ||
-                    (sym.owner.flags_field & STATIC) != 0)
+                    (sym.owner.flags_field & STATIC) != 0) {
                     mask |= STATIC;
-                else if ((flags & ENUM) != 0 || (flags & RECORD) != 0) {
+                } else if (!allowRecords && ((flags & ENUM) != 0 || (flags & RECORD) != 0)) {
                     log.error(pos, Errors.StaticDeclarationNotAllowedInInnerClasses);
                 }
                 // Nested interfaces and enums are always STATIC (Spec ???)
diff --git a/test/langtools/tools/javac/AnonStaticMember_1.java b/test/langtools/tools/javac/AnonStaticMember_1.java
@@ -24,10 +24,11 @@
 /*
  * @test
  * @bug 4279339
- * @summary Verify that an anonymous class cannot contain a static field.
+ * @summary Verify that an anonymous class can contain a static field only if source >= 16
  * @author maddox
  *
- * @run compile/fail AnonStaticMember_1.java
+ * @compile/fail/ref=AnonStaticMember_1.out -source 15 -XDrawDiagnostics AnonStaticMember_1.java
+ * @compile AnonStaticMember_1.java
  */
 
 class AnonStaticMember_1 {
diff --git a/test/langtools/tools/javac/AnonStaticMember_1.out b/test/langtools/tools/javac/AnonStaticMember_1.out
@@ -0,0 +1,4 @@
+- compiler.warn.source.no.system.modules.path: 15
+AnonStaticMember_1.java:36:20: compiler.err.icls.cant.have.static.decl: compiler.misc.anonymous.class: AnonStaticMember_1$1
+1 error
+1 warning
diff --git a/test/langtools/tools/javac/AnonStaticMember_2.java b/test/langtools/tools/javac/AnonStaticMember_2.java
@@ -1,10 +1,11 @@
 /*
  * @test  /nodynamiccopyright/
  * @bug 4279339 6969184
- * @summary Verify that an anonymous class cannot contain a static method.
+ * @summary Verify that an anonymous class can contain a static method only if source >= 16
  * @author maddox
  *
- * @run compile/fail/ref=AnonStaticMember_2.out -XDrawDiagnostics AnonStaticMember_2.java
+ * @compile/fail/ref=AnonStaticMember_2.out -source 15 -XDrawDiagnostics AnonStaticMember_2.java
+ * @compile AnonStaticMember_2.java
  */
 
 class AnonStaticMember_2 {
diff --git a/test/langtools/tools/javac/AnonStaticMember_2.out b/test/langtools/tools/javac/AnonStaticMember_2.out
@@ -1,2 +1,4 @@
-AnonStaticMember_2.java:12:21: compiler.err.icls.cant.have.static.decl: compiler.misc.anonymous.class: AnonStaticMember_2$1
+- compiler.warn.source.no.system.modules.path: 15
+AnonStaticMember_2.java:13:21: compiler.err.icls.cant.have.static.decl: compiler.misc.anonymous.class: AnonStaticMember_2$1
 1 error
+1 warning
diff --git a/test/langtools/tools/javac/InnerNamedConstant_2.java b/test/langtools/tools/javac/InnerNamedConstant_2.java
@@ -4,7 +4,8 @@
  * @summary Verify rejection of illegal static variables in inner classes.
  * @author William Maddox (maddox)
  *
- * @compile/fail/ref=InnerNamedConstant_2.out -XDrawDiagnostics InnerNamedConstant_2.java
+ * @compile/fail/ref=InnerNamedConstant_2_A.out -XDrawDiagnostics -source 15 InnerNamedConstant_2.java
+ * @compile/fail/ref=InnerNamedConstant_2_B.out -XDrawDiagnostics InnerNamedConstant_2.java
  */
 
 public class InnerNamedConstant_2 {
diff --git a/test/langtools/tools/javac/InnerNamedConstant_2.out b/test/langtools/tools/javac/InnerNamedConstant_2.out
diff --git a/test/langtools/tools/javac/InnerNamedConstant_2_A.out b/test/langtools/tools/javac/InnerNamedConstant_2_A.out
@@ -0,0 +1,7 @@
+- compiler.warn.source.no.system.modules.path: 15
+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:35:26: compiler.err.icls.cant.have.static.decl: InnerNamedConstant_2.Inner3
+4 errors
+1 warning
diff --git a/test/langtools/tools/javac/InnerNamedConstant_2_B.out b/test/langtools/tools/javac/InnerNamedConstant_2_B.out
@@ -0,0 +1,2 @@
+InnerNamedConstant_2.java:26:13: compiler.err.cant.assign.val.to.final.var: z
+1 error
diff --git a/test/langtools/tools/javac/InterfaceInInner.java b/test/langtools/tools/javac/InterfaceInInner.java
@@ -1,10 +1,11 @@
 /*
  * @test  /nodynamiccopyright/
  * @bug 4063740 6969184
- * @summary Interfaces may only be declared in top level classes.
+ * @summary Interfaces can be declared in inner classes only for source >= 16
  * @author turnidge
  *
- * @compile/fail/ref=InterfaceInInner.out -XDrawDiagnostics InterfaceInInner.java
+ * @compile/fail/ref=InterfaceInInner.out -XDrawDiagnostics -source 15 InterfaceInInner.java
+ * @compile InterfaceInInner.java
  */
 class InterfaceInInner {
     InterfaceInInner() {
diff --git a/test/langtools/tools/javac/InterfaceInInner.out b/test/langtools/tools/javac/InterfaceInInner.out
@@ -1,2 +1,4 @@
-InterfaceInInner.java:12:13: compiler.err.static.declaration.not.allowed.in.inner.classes
+- compiler.warn.source.no.system.modules.path: 15
+InterfaceInInner.java:13:13: compiler.err.icls.cant.have.static.decl: foo
 1 error
+1 warning
diff --git a/test/langtools/tools/javac/T8222035/MinContextOpTest.java b/test/langtools/tools/javac/T8222035/MinContextOpTest.java
@@ -25,7 +25,8 @@
  * @test
  * @bug 8222035
  * @summary minimal inference context optimization is forcing resolution with incomplete constraints
- * @compile/fail/ref=MinContextOpTest.out -XDrawDiagnostics MinContextOpTest.java
+ * @compile/fail/ref=MinContextOpTest_A.out -XDrawDiagnostics -source 15 MinContextOpTest.java
+ * @compile/fail/ref=MinContextOpTest_B.out -XDrawDiagnostics MinContextOpTest.java
  */
 
 import java.util.Map;
diff --git a/test/langtools/tools/javac/T8222035/MinContextOpTest_A.out b/test/langtools/tools/javac/T8222035/MinContextOpTest_A.out
@@ -0,0 +1,6 @@
+- compiler.warn.source.no.system.modules.path: 15
+MinContextOpTest.java:39:25: compiler.err.mod.not.allowed.here: static
+MinContextOpTest.java:45:25: compiler.err.mod.not.allowed.here: static
+MinContextOpTest.java:51:34: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.assignment.exists: T,K,V,E, (compiler.misc.inconvertible.types: java.util.function.Function<MinContextOpTest.A.T,MinContextOpTest.A.T>, java.util.function.Function<? super MinContextOpTest.A.T,? extends MinContextOpTest.A.T<?>>))
+3 errors
+1 warning
diff --git a/test/langtools/tools/javac/T8222035/MinContextOpTest_B.out b/test/langtools/tools/javac/T8222035/MinContextOpTest_B.out
@@ -1,4 +1,2 @@
-MinContextOpTest.java:38:25: compiler.err.mod.not.allowed.here: static
-MinContextOpTest.java:44:25: compiler.err.mod.not.allowed.here: static
-MinContextOpTest.java:50:34: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.assignment.exists: T,K,V,E, (compiler.misc.inconvertible.types: java.util.function.Function<MinContextOpTest.A.T,MinContextOpTest.A.T>, java.util.function.Function<? super MinContextOpTest.A.T,? extends MinContextOpTest.A.T<?>>))
-3 errors
+MinContextOpTest.java:51:34: compiler.err.prob.found.req: (compiler.misc.infer.no.conforming.assignment.exists: T,K,V,E, (compiler.misc.inconvertible.types: java.util.function.Function<MinContextOpTest.A.T,MinContextOpTest.A.T>, java.util.function.Function<? super MinContextOpTest.A.T,? extends MinContextOpTest.A.T<?>>))
+1 error
diff --git a/test/langtools/tools/javac/diags/examples/EnumsMustBeStatic.java b/test/langtools/tools/javac/diags/examples/EnumsMustBeStatic.java
@@ -22,6 +22,8 @@
  */
 
 // key: compiler.err.static.declaration.not.allowed.in.inner.classes
+// key: compiler.warn.source.no.system.modules.path
+// options: -source 15
 
 class EnumsMustBeStatic {
     class Nested {
diff --git a/test/langtools/tools/javac/diags/examples/InnerClassCantHaveStatic.java b/test/langtools/tools/javac/diags/examples/InnerClassCantHaveStatic.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2020 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
@@ -22,6 +22,8 @@
  */
 
 // key: compiler.err.icls.cant.have.static.decl
+// key: compiler.warn.source.no.system.modules.path
+// options: -source 15
 
 class InnerClassCantHaveStatic {
     class Inner {
diff --git a/test/langtools/tools/javac/diags/examples/RecordsNotAllowedInInnerClasses.java b/test/langtools/tools/javac/diags/examples/RecordsNotAllowedInInnerClasses.java
diff --git a/test/langtools/tools/javac/enum/NestedEnum.java b/test/langtools/tools/javac/enum/NestedEnum.java
@@ -1,10 +1,11 @@
 /*
  * @test /nodynamiccopyright/
  * @bug 5071831
- * @summary javac allows enum in an inner class
+ * @summary javac allows enum in an inner class for source >= 16
  * @author gafter
  *
- * @compile/fail/ref=NestedEnum.out -XDrawDiagnostics  NestedEnum.java
+ * @compile/fail/ref=NestedEnum.out -XDrawDiagnostics -source 15 NestedEnum.java
+ * @compile NestedEnum.java
  */
 
 class NestedEnum {
diff --git a/test/langtools/tools/javac/enum/NestedEnum.out b/test/langtools/tools/javac/enum/NestedEnum.out
@@ -1,2 +1,4 @@
-NestedEnum.java:12:9: compiler.err.static.declaration.not.allowed.in.inner.classes
+- compiler.warn.source.no.system.modules.path: 15
+NestedEnum.java:13:9: compiler.err.static.declaration.not.allowed.in.inner.classes
 1 error
+1 warning
diff --git a/test/langtools/tools/javac/enum/T5081785.java b/test/langtools/tools/javac/enum/T5081785.java
@@ -1,9 +1,10 @@
 /*
  * @test /nodynamiccopyright/
  * @bug 5081785
- * @summary Empty Enums allowed in non-static contexts
+ * @summary enums should be allowed in non-static contexts
  * @author Peter von der Ah\u00e9
- * @compile/fail/ref=T5081785.out -XDrawDiagnostics  T5081785.java
+ * @compile/fail/ref=T5081785.out -XDrawDiagnostics -source 15 T5081785.java
+ * @compile T5081785.java
  */
 
 class A1 {
diff --git a/test/langtools/tools/javac/enum/T5081785.out b/test/langtools/tools/javac/enum/T5081785.out
@@ -1,5 +1,7 @@
-T5081785.java:29:9: compiler.err.static.declaration.not.allowed.in.inner.classes
-T5081785.java:12:13: compiler.err.static.declaration.not.allowed.in.inner.classes
-T5081785.java:19:27: compiler.err.static.declaration.not.allowed.in.inner.classes
-T5081785.java:24:31: compiler.err.static.declaration.not.allowed.in.inner.classes
+- compiler.warn.source.no.system.modules.path: 15
+T5081785.java:30:9: compiler.err.static.declaration.not.allowed.in.inner.classes
+T5081785.java:13:13: compiler.err.static.declaration.not.allowed.in.inner.classes
+T5081785.java:20:27: compiler.err.static.declaration.not.allowed.in.inner.classes
+T5081785.java:25:31: compiler.err.static.declaration.not.allowed.in.inner.classes
 4 errors
+1 warning
diff --git a/test/langtools/tools/javac/records/LocalStaticDeclarations.java b/test/langtools/tools/javac/records/LocalStaticDeclarations.java
diff --git a/test/langtools/tools/javac/records/RecordCompilationTests.java b/test/langtools/tools/javac/records/RecordCompilationTests.java

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@`
`4`	`4`	`* @summary Verify rejection of illegal static variables in inner classes.`
`5`	`5`	`* @author William Maddox (maddox)`
`6`	`6`	`*`
`7`		`- * @compile/fail/ref=InnerNamedConstant_2.out -XDrawDiagnostics InnerNamedConstant_2.java`
	`7`	`+ * @compile/fail/ref=InnerNamedConstant_2_A.out -XDrawDiagnostics -source 15 InnerNamedConstant_2.java`
	`8`	`+ * @compile/fail/ref=InnerNamedConstant_2_B.out -XDrawDiagnostics InnerNamedConstant_2.java`
`8`	`9`	`*/`
`9`	`10`
`10`	`11`	`public class InnerNamedConstant_2 {`