OpenJDK / amber / amber
changeset 35349:4a13a361309a
8147493: regression when type-checking unchecked method calls
Summary: Shared warner in Attr.checkMethod leads to spurious inference errors
Reviewed-by: vromero
author | mcimadamore |
---|---|
date | Wed, 20 Jan 2016 10:50:28 +0000 |
parents | 95a9b9409b50 |
children | 5ec1564e7b1f |
files | langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java langtools/test/tools/javac/generics/inference/8147493/T8147493a.java langtools/test/tools/javac/generics/inference/8147493/T8147493b.java |
diffstat | 3 files changed, 88 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Tue Jan 19 15:46:42 2016 +0530 +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Wed Jan 20 10:50:28 2016 +0000 @@ -3873,8 +3873,6 @@ v.name != names._class; } - Warner noteWarner = new Warner(); - /** * Check that method arguments conform to its instantiation. **/ @@ -3928,7 +3926,7 @@ // For methods, we need to compute the instance type by // Resolve.instantiate from the symbol's type as well as // any type arguments and value arguments. - noteWarner.clear(); + Warner noteWarner = new Warner(); try { Type owntype = rs.checkMethod( env,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/generics/inference/8147493/T8147493a.java Wed Jan 20 10:50:28 2016 +0000 @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8147493 + * @summary regression when type-checking unchecked method calls + * @compile T8147493a.java + */ + +abstract class T8147493a { + interface One {} + interface Two<I extends One> { I get(); } + interface Three<T> {} + interface Four<T> {} + + <E extends Two<?>, L extends Three<E>> Four<L> f(Class raw, E destination) { + return g(raw, destination.get()); + } + + abstract <I extends One, E extends Two<I>, L extends Three<E>> Four<L> g( + Class<L> labelClass, I destinationId); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/generics/inference/8147493/T8147493b.java Wed Jan 20 10:50:28 2016 +0000 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8147493 + * @summary regression when type-checking unchecked method calls + * @compile T8147493b.java + */ + +abstract class T8147493b { + + abstract <A> A f(A t); + abstract <B> Class<B> g(Class<B> x, String y); + abstract <C> void h(C t); + + void m(Class raw) { + h(g(raw, f(null))); + } +}