6481655: Parser confused by combination of parens and explicit type args

Summary: Bug in the parser caused by the fact that explicit type arguments are disabled when parsing parenthesized expressions
Reviewed-by: jjg

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

@@ -1006,7 +1006,10 @@ public class Parser {
                     break loop;
                 case DOT:
                     S.nextToken();
+                    int oldmode = mode;
+                    mode &= ~NOPARAMS;
                     typeArgs = typeArgumentsOpt(EXPR);
+                    mode = oldmode;
                     if ((mode & EXPR) != 0) {
                         switch (S.token()) {
                         case CLASS:

test/tools/javac/generics/T6481655.java

+/*
+ * Copyright 2008 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
+ * @bug     6481655
+ * @summary Parser confused by combination of parens and explicit type args
+ * @author Maurizio Cimadamore
+ */
+
+public class T6481655 {
+
+    public static <T> T getT(T t) {
+        return t;
+    }
+
+    public static void main(String... s) {
+        T6481655.<String>getT("");
+        (T6481655.<String>getT("")).getClass();
+    }
+}