changeset 51416:8c2faee50bc4

8207320: Wrong type order for intersection lambdas with multiple abstract methods Reviewed-by: mcimadamore
author vromero
date Wed, 15 Aug 2018 13:39:32 -0700
parents 0aa5378d4f09
children b08c2a94cce1
files src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java test/langtools/tools/javac/T8207320/IntersectionOrderTest.java test/langtools/tools/javac/T8207320/IntersectionOrderTest2.java
diffstat 3 files changed, 107 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Wed Aug 15 16:01:48 2018 -0400
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Wed Aug 15 13:39:32 2018 -0700
@@ -499,7 +499,8 @@
                 break;
 
             case BOUND:             /** Expr :: instMethod */
-                init = tree.getQualifierExpression();
+                init = transTypes.coerce(attrEnv, tree.getQualifierExpression(),
+                    types.erasure(tree.sym.owner.type));
                 init = attr.makeNullCheck(init);
                 break;
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/T8207320/IntersectionOrderTest.java	Wed Aug 15 13:39:32 2018 -0700
@@ -0,0 +1,47 @@
+/*
+ * 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 8207320
+ * @summary Wrong type order for intersection lambdas with multiple abstract methods
+ */
+
+public class IntersectionOrderTest {
+    interface A {
+        void a();
+    }
+
+    interface AB extends A {
+        default void a() {
+            System.out.println("A");
+        }
+        default void b() {
+            System.out.println("B");
+        }
+    }
+
+    public static void main(String... args) {
+        Object o = new AB() {};
+        Runnable r = ((A & AB) o)::b;
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/T8207320/IntersectionOrderTest2.java	Wed Aug 15 13:39:32 2018 -0700
@@ -0,0 +1,58 @@
+/*
+ * 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 8207320
+ * @summary Wrong type order for intersection lambdas with multiple abstract methods
+ */
+
+public class IntersectionOrderTest2 {
+    interface A {
+        void a();
+    }
+
+    interface B {
+        void b();
+    }
+
+    interface C {
+        void c();
+    }
+
+    interface AB extends A, B {
+        @Override
+        default void a() {
+            System.out.println("A");
+        }
+
+        @Override
+        default void b() {
+            System.out.println("B");
+        }
+    }
+
+    public static void main(String[] args) {
+        Runnable a = ((A & B & AB & C) () -> System.out.println("Called"))::b;
+        a.run();
+    }
+}