Mercurial > hg > openjdk > jigsaw > langtools
changeset 1748:332f23993353
8008813: Structural most specific fails when method reference is passed to overloaded method
Summary: Bad logic for checking most specific method reference type
Reviewed-by: jjg
author | mcimadamore |
---|---|
date | Thu, 28 Feb 2013 14:05:44 +0000 |
parents | 133a0a0c2cbc |
children | 08782b8b03ce |
files | src/share/classes/com/sun/tools/javac/comp/Resolve.java test/tools/javac/lambda/MostSpecific08.java |
diffstat | 2 files changed, 63 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java Thu Feb 28 14:00:52 2013 +0000 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java Thu Feb 28 14:05:44 2013 +0000 @@ -984,7 +984,7 @@ Type ret_t = desc_t.getReturnType(); Type ret_s = desc_s.getReturnType(); result &= ((tree.refPolyKind == PolyKind.STANDALONE) - ? standaloneMostSpecific(ret_t, ret_s, tree.type, warn) + ? standaloneMostSpecific(ret_t, ret_s, tree.sym.type.getReturnType(), warn) : polyMostSpecific(ret_t, ret_s, warn)); } else { return;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/lambda/MostSpecific08.java Thu Feb 28 14:05:44 2013 +0000 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2013, 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 8008813 + * @summary Structural most specific fails when method reference is passed to overloaded method + * @compile MostSpecific08.java + */ +class MostSpecific08 { + + static class C { + int getInt() { return -1; } + Integer getInteger() { return -1; } + } + + interface IntResult { } + interface ReferenceResult<X> { } + + interface PrimitiveFunction { + int f(C c); + } + + interface ReferenceFunction<X> { + X f(C c); + } + + interface Tester { + IntResult apply(PrimitiveFunction p); + <Z> ReferenceResult<Z> apply(ReferenceFunction<Z> p); + } + + void testMref(Tester t) { + IntResult pr = t.apply(C::getInt); + ReferenceResult<Integer> rr = t.apply(C::getInteger); + } + + void testLambda(Tester t) { + IntResult pr = t.apply(c->c.getInt()); + ReferenceResult<Integer> rr = t.apply(c->c.getInteger()); + } +}