diff --git a/src/share/classes/com/sun/tools/javac/comp/Resolve.java b/src/share/classes/com/sun/tools/javac/comp/Resolve.java index ea98b568aeeb0d4289c649ac8859dba657d25bdf..703e884439392d9fb1e00c0c877199ced70d7843 100644 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java @@ -984,7 +984,7 @@ public class Resolve { 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; diff --git a/test/tools/javac/lambda/MostSpecific08.java b/test/tools/javac/lambda/MostSpecific08.java new file mode 100644 index 0000000000000000000000000000000000000000..453f04cd7f4cd4e981b95816ad2338a4bdd67115 --- /dev/null +++ b/test/tools/javac/lambda/MostSpecific08.java @@ -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 { } + + interface PrimitiveFunction { + int f(C c); + } + + interface ReferenceFunction { + X f(C c); + } + + interface Tester { + IntResult apply(PrimitiveFunction p); + ReferenceResult apply(ReferenceFunction p); + } + + void testMref(Tester t) { + IntResult pr = t.apply(C::getInt); + ReferenceResult rr = t.apply(C::getInteger); + } + + void testLambda(Tester t) { + IntResult pr = t.apply(c->c.getInt()); + ReferenceResult rr = t.apply(c->c.getInteger()); + } +}