infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-05 03:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

8011392: Missing checkcast when casting to intersection type

Browse Source 
Javac should emit a checkcast for each additional target type specified in an intersection type cast

Reviewed-by: jjg
This commit is contained in:
Maurizio Cimadamore 2013-04-15 14:17:30 +01:00
parent 8f2d47cf79
commit 8b680bdde2
2 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
View File

@ -710,8 +710,18 @@ public class TransTypes extends TreeTranslator {
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;
}

49
langtools/test/tools/javac/lambda/Intersection03.java Normal file
View File

@ -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<String>();
assertTrue(false);
} catch (ClassCastException cce) {
assertTrue(true);
}
assertTrue(assertionCount == 1);
}
}