changeset 50210:9ce050c4711b

8203486: skip type inference for non functional interface components of intersection types Reviewed-by: mcimadamore
author vromero
date Mon, 21 May 2018 12:27:21 -0700
parents 83d8b3a25f25
children a2c92332c6ba
files src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java test/langtools/tools/javac/T8203486/SkipInferenceForNonFunctionalInterfTest.java
diffstat 2 files changed, 57 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java	Mon May 21 15:15:58 2018 -0400
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java	Mon May 21 12:27:21 2018 -0700
@@ -2668,8 +2668,12 @@
                     ListBuffer<Type> components = new ListBuffer<>();
                     for (Type bound : ict.getExplicitComponents()) {
                         if (explicitParamTypes != null) {
-                            bound = infer.instantiateFunctionalInterface(that,
-                                    bound, explicitParamTypes, resultInfo.checkContext);
+                            try {
+                                bound = infer.instantiateFunctionalInterface(that,
+                                        bound, explicitParamTypes, resultInfo.checkContext);
+                            } catch (FunctionDescriptorLookupError t) {
+                                // do nothing
+                            }
                         }
                         bound = types.removeWildcards(bound);
                         components.add(bound);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/T8203486/SkipInferenceForNonFunctionalInterfTest.java	Mon May 21 12:27:21 2018 -0700
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2018, 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 8203486
+ * @summary skip type inference for non functional interface components of intersection types
+ * @compile SkipInferenceForNonFunctionalInterfTest.java
+ */
+
+class SkipInferenceForNonFunctionalInterfTest {
+    class U1 {}
+    class U2 {}
+    class U3 {}
+
+    interface SAM<P1 extends U1, P2 extends U2, P3 extends U3> {
+        P3 m(P1 p1, P2 p2);
+    }
+
+    interface I<T> {}
+
+    class Tester {
+        Object method(SAM<U1, U2, U3> sam) {
+            return null;
+        }
+
+        Object run() {
+            return method((SAM<U1, U2, U3> & I<?>) (U1 u1, U2 u2) -> { return new U3(); });
+        }
+    }
+}