8019821: allInteger switches were confused by boolean cases, as they are a narrower type than int

Reviewed-by: sundar, hannesw
This commit is contained in:
Marcus Lagergren 2013-07-04 17:27:33 +02:00
parent 047d1b732f
commit 0807ef3638
2 changed files with 40 additions and 0 deletions

View File

@ -791,6 +791,9 @@ final class Attr extends NodeOperatorVisitor<LexicalContext> {
}
type = Type.widest(type, newCaseNode.getTest().getType());
if (type.isBoolean()) {
type = Type.OBJECT; //booleans and integers aren't assignment compatible
}
}
newCases.add(newCaseNode);

View File

@ -0,0 +1,37 @@
/*
* Copyright (c) 2010, 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.
*/
/**
* JDK-8019821: boolean switch value accidentally triggered "allInts" case
* as boolean is considered narrower than int. This caused a ClassCastException
*
* @test
* @run
*/
function f() {
switch(gc()) {
case true:
case 1:
}
}