Mon, 24 Jan 2011 15:45:41 +0000
7013865: varargs: javac crashes during overload resolution with generic varargs
Summary: fixed regression with varargs overload resolution that leads javac to crash
Reviewed-by: jjg
src/share/classes/com/sun/tools/javac/comp/Infer.java | file | annotate | diff | comparison | revisions | |
test/tools/javac/varargs/T7013865.java | file | annotate | diff | comparison | revisions |
1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Infer.java Mon Jan 24 15:45:24 2011 +0000 1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java Mon Jan 24 15:45:41 2011 +0000 1.3 @@ -407,7 +407,9 @@ 1.4 1.5 // for varargs arguments as well 1.6 if (useVarargs) { 1.7 - Type elemType = types.elemtype(varargsFormal); 1.8 + //note: if applicability check is triggered by most specific test, 1.9 + //the last argument of a varargs is _not_ an array type (see JLS 15.12.2.5) 1.10 + Type elemType = types.elemtypeOrType(varargsFormal); 1.11 Type elemUndet = types.subst(elemType, tvars, undetvars); 1.12 while (actuals.nonEmpty()) { 1.13 Type actual = actuals.head.baseType();
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/test/tools/javac/varargs/T7013865.java Mon Jan 24 15:45:41 2011 +0000 2.3 @@ -0,0 +1,36 @@ 2.4 +/* 2.5 + * Copyright (c) 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.23 + * or visit www.oracle.com if you need additional information or have any 2.24 + * questions. 2.25 + */ 2.26 + 2.27 +/* 2.28 + * @test 2.29 + * @bug 7013865 2.30 + * @summary varargs: javac crashes during overload resolution with generic varargs 2.31 + * @compile T7013865.java 2.32 + */ 2.33 + 2.34 +class T7013865 { 2.35 + public <X extends Number> void m(X... args) { } 2.36 + public void m(Object... args) { } 2.37 + 2.38 + { m(null, null); } 2.39 +}