8371356: [lworld] 'super' should be rejected in early construction context

Reviewed-by: liach

Author: Vicente Romero

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

@@ -1381,6 +1381,17 @@ public void visitSelect(JCFieldAccess tree) {
             SelectScanner ss = new SelectScanner();
             ss.scan(tree);
             if (ss.scanLater == null) {
+                Symbol sym = TreeInfo.symbolFor(tree);
+                // if this is a field access
+                if (sym.kind == VAR && sym.owner.kind == TYP) {
+                    // Type.super.field or super.field expressions are forbidden in early construction contexts
+                    for (JCTree subtree : ss.selectorTrees) {
+                        if (TreeInfo.isSuperOrSelectorDotSuper(subtree)) {
+                            reportPrologueError(tree, sym);
+                            return;
+                        }
+                    }
+                }
                 analyzeSymbol(tree);
             } else {
                 boolean prevLhs = isInLHS;

src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java

@@ -179,6 +179,21 @@ public static boolean isIdentOrThisDotIdent(JCTree tree) {
         }
     }
 
+    /** Is this tree `super`, or `Ident.super`?
+     */
+    public static boolean isSuperOrSelectorDotSuper(JCTree tree) {
+        switch (tree.getTag()) {
+            case PARENS:
+                return isSuperOrSelectorDotSuper(skipParens(tree));
+            case IDENT:
+                return ((JCIdent)tree).name == ((JCIdent)tree).name.table.names._super;
+            case SELECT:
+                return ((JCFieldAccess)tree).name == ((JCFieldAccess)tree).name.table.names._super;
+            default:
+                return false;
+        }
+    }
+
     /** Check if the given tree is an explicit reference to the 'this' instance of the
      *  class currently being compiled. This is true if tree is:
      *  - An unqualified 'this' identifier

test/langtools/tools/javac/SuperInit/SuperInitFails.java

@@ -269,4 +269,20 @@ static class Inner8 {
             x = 4;
         }
     }
+
+    static class Inner9 {
+        interface Parent {
+            boolean check = true;
+        }
+
+        class Medium implements Parent {}
+
+        class Inner9Test extends Medium {
+            Inner9Test() {
+                boolean check1 = Inner9Test.super.check;
+                boolean check2 = super.check;
+                super();
+            }
+        }
+    }
 }

test/langtools/tools/javac/SuperInit/SuperInitFails.out

@@ -26,6 +26,8 @@ SuperInitFails.java:232:16: compiler.err.cant.ref.before.ctor.called: x
 SuperInitFails.java:241:35: compiler.err.cant.ref.before.ctor.called: this
 SuperInitFails.java:253:13: compiler.err.cant.ref.before.ctor.called: x
 SuperInitFails.java:266:18: compiler.err.cant.ref.before.ctor.called: x
+SuperInitFails.java:282:50: compiler.err.cant.ref.before.ctor.called: check
+SuperInitFails.java:283:39: compiler.err.cant.ref.before.ctor.called: check
 SuperInitFails.java:35:13: compiler.err.call.must.only.appear.in.ctor
 SuperInitFails.java:39:14: compiler.err.call.must.only.appear.in.ctor
 SuperInitFails.java:43:14: compiler.err.call.must.only.appear.in.ctor
@@ -35,4 +37,4 @@ SuperInitFails.java:55:32: compiler.err.call.must.only.appear.in.ctor
 SuperInitFails.java:85:18: compiler.err.ctor.calls.not.allowed.here
 SuperInitFails.java:91:13: compiler.err.return.before.superclass.initialized
 SuperInitFails.java:152:18: compiler.err.call.must.only.appear.in.ctor
-37 errors
+39 errors

test/langtools/tools/javac/SuperInit/SuperInitFailsWarnings.out

@@ -32,3 +32,5 @@ SuperInitFails.java:188:32: compiler.warn.would.not.be.allowed.in.prologue: x
 SuperInitFails.java:231:41: compiler.warn.would.not.be.allowed.in.prologue: x
 SuperInitFails.java:232:16: compiler.warn.would.not.be.allowed.in.prologue: x
 SuperInitFails.java:241:35: compiler.warn.would.not.be.allowed.in.prologue: this
+SuperInitFails.java:282:50: compiler.warn.would.not.be.allowed.in.prologue: check
+SuperInitFails.java:283:39: compiler.warn.would.not.be.allowed.in.prologue: check