OpenJDK / portola / portola
changeset 27849:df6cd9799fcd
8063052: Inference chokes on wildcard derived from method reference
Reviewed-by: mcimadamore
author | vromero |
---|---|
date | Thu, 20 Nov 2014 14:05:39 -0800 |
parents | 3b63f22ce42b |
children | d27ca106daa4 |
files | langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java langtools/test/tools/javac/lambda/methodReference/MethodRef8.java |
diffstat | 2 files changed, 44 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java Thu Nov 20 11:17:17 2014 -0800 +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java Thu Nov 20 14:05:39 2014 -0800 @@ -3172,7 +3172,7 @@ super(referenceTree, name, site, argtypes.tail, typeargtypes, maxPhase); if (site.isRaw() && !argtypes.head.hasTag(NONE)) { Type asSuperSite = types.asSuper(argtypes.head, site.tsym); - this.site = asSuperSite; + this.site = types.capture(asSuperSite); } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/lambda/methodReference/MethodRef8.java Thu Nov 20 14:05:39 2014 -0800 @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2014, 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. + * + * 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 8063052 + * @summary Inference chokes on wildcard derived from method reference + * @compile MethodRef8.java + */ + +public class MethodRef8 { + void test(Box<? extends Box<? extends Number>> b) { + Number n1 = b.map(Box::get).get(); + Number n2 = b.<Number>map(Box::get).get(); + } + + interface Func<S,T> { T apply(S arg); } + + interface Box<T> { + T get(); + <R> Box<R> map(Func<T,R> f); + } +}