Wed, 09 Apr 2008 14:05:24 +0100
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 | file | annotate | diff | comparison | revisions | |
test/tools/javac/generics/T6481655.java | file | annotate | diff | comparison | revisions |
1.1 --- a/src/share/classes/com/sun/tools/javac/parser/Parser.java Wed Apr 09 13:53:45 2008 +0100 1.2 +++ b/src/share/classes/com/sun/tools/javac/parser/Parser.java Wed Apr 09 14:05:24 2008 +0100 1.3 @@ -1006,7 +1006,10 @@ 1.4 break loop; 1.5 case DOT: 1.6 S.nextToken(); 1.7 + int oldmode = mode; 1.8 + mode &= ~NOPARAMS; 1.9 typeArgs = typeArgumentsOpt(EXPR); 1.10 + mode = oldmode; 1.11 if ((mode & EXPR) != 0) { 1.12 switch (S.token()) { 1.13 case CLASS:
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/test/tools/javac/generics/T6481655.java Wed Apr 09 14:05:24 2008 +0100 2.3 @@ -0,0 +1,41 @@ 2.4 +/* 2.5 + * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. 2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.7 + * 2.8 + * This code is free software; you can redistribute it and/or modify it 2.9 + * under the terms of the GNU General Public License version 2 only, as 2.10 + * published by the Free Software Foundation. 2.11 + * 2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT 2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.15 + * version 2 for more details (a copy is included in the LICENSE file that 2.16 + * accompanied this code). 2.17 + * 2.18 + * You should have received a copy of the GNU General Public License version 2.19 + * 2 along with this work; if not, write to the Free Software Foundation, 2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.21 + * 2.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, 2.23 + * CA 95054 USA or visit www.sun.com if you need additional information or 2.24 + * have any questions. 2.25 + */ 2.26 + 2.27 +/* 2.28 + * @test 2.29 + * @bug 6481655 2.30 + * @summary Parser confused by combination of parens and explicit type args 2.31 + * @author Maurizio Cimadamore 2.32 + */ 2.33 + 2.34 +public class T6481655 { 2.35 + 2.36 + public static <T> T getT(T t) { 2.37 + return t; 2.38 + } 2.39 + 2.40 + public static void main(String... s) { 2.41 + T6481655.<String>getT(""); 2.42 + (T6481655.<String>getT("")).getClass(); 2.43 + } 2.44 +}