# HG changeset patch # User mcimadamore # Date 1366031850 -3600 # Node ID 0c9f2cc31ae72514d8d2177f8f74c2a7923e1ea8 # Parent 8f424142e725faeabc56c54dec71a303520b5813 8011392: Missing checkcast when casting to intersection type Summary: javac should emit a checkcast for each additional target type specified in an intersection type cast Reviewed-by: jjg diff -r 8f424142e725 -r 0c9f2cc31ae7 langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java --- a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Mon Apr 15 14:16:05 2013 +0100 +++ b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java Mon Apr 15 14:17:30 2013 +0100 @@ -710,8 +710,18 @@ public void visitTypeCast(JCTypeCast tree) { tree.clazz = translate(tree.clazz, null); + Type originalTarget = tree.type; tree.type = erasure(tree.type); tree.expr = translate(tree.expr, tree.type); + if (originalTarget.isCompound()) { + Type.IntersectionClassType ict = (Type.IntersectionClassType)originalTarget; + for (Type c : ict.getExplicitComponents()) { + Type ec = erasure(c); + if (!types.isSameType(ec, tree.type)) { + tree.expr = coerce(tree.expr, ec); + } + } + } result = tree; } diff -r 8f424142e725 -r 0c9f2cc31ae7 langtools/test/tools/javac/lambda/Intersection03.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/langtools/test/tools/javac/lambda/Intersection03.java Mon Apr 15 14:17:30 2013 +0100 @@ -0,0 +1,49 @@ +/* + * 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 8011392 + * @summary Missing checkcast when casting to intersection type + */ +import java.util.*; + +public class Intersection03 { + + static int assertionCount = 0; + + static void assertTrue(boolean cond) { + assertionCount++; + if (!cond) throw new AssertionError(); + } + + public static void main(String[] args) { + try { + Runnable r = (List & Runnable)new ArrayList(); + assertTrue(false); + } catch (ClassCastException cce) { + assertTrue(true); + } + assertTrue(assertionCount == 1); + } +}