changeset 51827:07179f7db03d

8209022: Missing checkcast when casting to type parameter bounded by intersection type Reviewed-by: mcimadamore
author vromero
date Thu, 20 Sep 2018 12:49:58 -0700
parents e777e997e7c1
children a7448f4f89a0
files src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java test/langtools/tools/javac/typeVariableCast/TypeVariableCastTest.java
diffstat 2 files changed, 54 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java	Thu Sep 20 21:14:38 2018 +0200
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TransTypes.java	Thu Sep 20 12:49:58 2018 -0700
@@ -772,7 +772,7 @@
                 }
             }
         }
-        result = tree;
+        result = retype(tree, tree.type, pt);
     }
 
     public void visitTypeTest(JCInstanceOf tree) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/langtools/tools/javac/typeVariableCast/TypeVariableCastTest.java	Thu Sep 20 12:49:58 2018 -0700
@@ -0,0 +1,53 @@
+/*
+ * 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 8209022
+ * @run testng TypeVariableCastTest
+ * @summary Missing checkcast when casting to type parameter bounded by intersection type
+ */
+
+import java.util.*;
+import org.testng.annotations.Test;
+
+@Test
+public class TypeVariableCastTest {
+    static <T extends List<?> & Runnable> void f() {
+        Runnable r = (T) new ArrayList<>();
+    }
+
+    static <T extends Runnable & List<?>> void g() {
+        Runnable r = (T) new ArrayList<>();
+    }
+
+    @Test(expectedExceptions = ClassCastException.class)
+    static void testMethodF() {
+        f();
+    }
+
+    @Test(expectedExceptions = ClassCastException.class)
+    static void testMethodG() {
+        g();
+    }
+}