6795580: parser confused by square brackets in qualified generic cast

Summary: Parser rejects cast with qualified generic array types
Reviewed-by: jjg

src/share/classes/com/sun/tools/javac/parser/JavacParser.java

@@ -863,13 +863,13 @@ public class JavacParser implements Parser {
                         accept(GT);
                         t = F.at(pos1).TypeApply(t, args.toList());
                         checkGenerics();
-                        t = bracketsOpt(toP(t));
                         while (S.token() == DOT) {
                             S.nextToken();
                             mode = TYPE;
                             t = toP(F.at(S.pos()).Select(t, ident()));
                             t = typeArgumentsOpt(t);
                         }
+                        t = bracketsOpt(toP(t));
                     } else if ((mode & EXPR) != 0) {
                         mode = EXPR;
                         t = F.at(pos1).Binary(op, t, term2Rest(t1, TreeInfo.shiftPrec));

test/tools/javac/cast/6795580/T6795580.java

+/*
+ * Copyright 2009 Sun Microsystems, Inc.  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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @author Maurizio Cimadamore
+ * @bug     6795580
+ * @summary parser confused by square brackets in qualified generic cast
+ * @compile/fail/ref=T6795580.out -XDrawDiagnostics T6795580.java
+ */
+
+class T6795580 {
+    class Outer<S> {
+        class Inner<T> {}
+    }
+
+    void cast1(Outer<Integer>.Inner<Long>[] p) {
+        Object o = (Outer<Integer>.Inner<Long>[])p;
+    }
+
+    void cast2(Outer<Integer>.Inner<Long>[] p) {
+        Object o = (Outer<? extends Number>.Inner<Long>[])p;
+    }
+
+    void cast3(Outer<Integer>.Inner<Long>[] p) {
+        Object o = (Outer<Integer>.Inner<? extends Number>[])p;
+    }
+
+    void cast4(Outer<Integer>.Inner<Long>[] p) {
+        Object o = (Outer<? extends Number>.Inner<? extends Number>[])p;
+    }
+
+    void cast5(Outer<Integer>.Inner<Long>[] p) {
+        Object o = (Outer<? super Number>.Inner<Long>[])p;
+    }
+
+    void cast6(Outer<Integer>.Inner<Long>[] p) {
+        Object o = (Outer<Integer>.Inner<? super Number>[])p;
+    }
+
+    void cast7(Outer<Integer>.Inner<Long>[] p) {
+        Object o = (Outer<? super Number>.Inner<? super Number>[])p;
+    }
+
+    void cast8(Outer<Integer>.Inner<Long>[] p) {
+        Object o = (Outer<? extends String>.Inner<Long>[])p;
+    }
+
+    void cast9(Outer<Integer>.Inner<Long>[] p) {
+        Object o = (Outer<Integer>.Inner<? extends String>[])p;
+    }
+
+    void cast10(Outer<Integer>.Inner<Long>[] p) {
+        Object o = (Outer<? super String>.Inner<Long>[])p;
+    }
+
+    void cast11(Outer<Integer>.Inner<Long>[] p) {
+        Object o = (Outer<Integer>.Inner<? super String>[])p;
+    }
+}
\ No newline at end of file

test/tools/javac/cast/6795580/T6795580.out

+T6795580.java:54:57: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<java.lang.Long>[]
+T6795580.java:58:60: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.Number>[]
+T6795580.java:62:67: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.Number>.Inner<? super java.lang.Number>[]
+T6795580.java:66:59: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? extends java.lang.String>.Inner<java.lang.Long>[]
+T6795580.java:70:62: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? extends java.lang.String>[]
+T6795580.java:74:57: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<? super java.lang.String>.Inner<java.lang.Long>[]
+T6795580.java:78:60: compiler.err.prob.found.req: (- compiler.misc.inconvertible.types), T6795580.Outer<java.lang.Integer>.Inner<java.lang.Long>[], T6795580.Outer<java.lang.Integer>.Inner<? super java.lang.String>[]
+7 errors