Skip to content

Commit f935c7b

Browse files
author
Srikanth Adayapalam
committed
8141508: java.lang.invoke.LambdaConversionException: Invalid receiver type
Incorrect handling of intersection type parameter of functional interface descriptor results in call site initialization exception Reviewed-by: mcimadamore
1 parent 7812e1a commit f935c7b

File tree

2 files changed

+64
-3
lines changed

2 files changed

+64
-3
lines changed

langtools/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java

-3
Original file line numberDiff line numberDiff line change
@@ -2216,9 +2216,6 @@ final boolean isSignaturePolymorphic() {
22162216
*/
22172217
boolean interfaceParameterIsIntersectionType() {
22182218
List<Type> tl = tree.getDescriptorType(types).getParameterTypes();
2219-
if (tree.kind == ReferenceKind.UNBOUND) {
2220-
tl = tl.tail;
2221-
}
22222219
for (; tl.nonEmpty(); tl = tl.tail) {
22232220
Type pt = tl.head;
22242221
if (pt.getKind() == TypeKind.TYPEVAR) {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*
2+
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
/**
25+
* @test
26+
* @bug 8141508
27+
* @summary Test that Call site initialization exception is not thrown when the method
28+
reference receiver is of intersection type.
29+
* @run main IntersectionTypeReceiverTest
30+
*/
31+
32+
import java.time.LocalDate;
33+
import java.util.EnumSet;
34+
import java.util.Objects;
35+
import java.util.Optional;
36+
import java.util.function.Function;
37+
import java.util.function.Supplier;
38+
39+
public class IntersectionTypeReceiverTest {
40+
41+
public static void main(String[] args) {
42+
String output = valueOfKey(Size.class, LocalDate.now()).toString();
43+
if (!"Optional[S]".equals(output))
44+
throw new AssertionError("Unexpected output: " + output);
45+
}
46+
47+
enum Size implements Supplier<LocalDate> {
48+
S, M, L;
49+
50+
@Override
51+
public LocalDate get() {
52+
return LocalDate.now();
53+
}
54+
55+
}
56+
57+
public static <K, T extends Enum<T> & Supplier<K>> Optional<T> valueOfKey(Class<T> enumType, K key) {
58+
return valueOf(enumType, key, T::get);
59+
}
60+
61+
public static <K, T extends Enum<T>> Optional<T> valueOf(Class<T> enumType, K key, Function<T, K> keyExtractor) {
62+
return EnumSet.allOf(enumType).stream().filter(t -> Objects.equals(keyExtractor.apply(t), key)).findFirst();
63+
}
64+
}

0 commit comments

Comments
 (0)