# HG changeset patch # User mcimadamore # Date 1207746324 -3600 # Node ID 8d0b2c7d60a1d0ca7e6d8586fc6f7a66d3550a42 # Parent 0fe323fc32868a1f2d83deb491fbe8d891ce8714 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 diff -r 0fe323fc3286 -r 8d0b2c7d60a1 langtools/src/share/classes/com/sun/tools/javac/parser/Parser.java --- a/langtools/src/share/classes/com/sun/tools/javac/parser/Parser.java Wed Apr 09 13:53:45 2008 +0100 +++ b/langtools/src/share/classes/com/sun/tools/javac/parser/Parser.java Wed Apr 09 14:05:24 2008 +0100 @@ -1006,7 +1006,10 @@ 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: diff -r 0fe323fc3286 -r 8d0b2c7d60a1 langtools/test/tools/javac/generics/T6481655.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/generics/T6481655.java Wed Apr 09 14:05:24 2008 +0100 @@ -0,0 +1,41 @@ +/* + * 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 getT(T t) { + return t; + } + + public static void main(String... s) { + T6481655.getT(""); + (T6481655.getT("")).getClass(); + } +}