Mercurial > people > rkennke > jdk9-shenandoah-final > nashorn
changeset 411:be2087629eb9
8019821: allInteger switches were confused by boolean cases, as they are a narrower type than int
Reviewed-by: sundar, hannesw
author | lagergren |
---|---|
date | Thu, 04 Jul 2013 17:27:33 +0200 |
parents | 961cffae0828 |
children | 8c4a6d9b8a23 |
files | src/jdk/nashorn/internal/codegen/Attr.java test/script/basic/JDK-8019821.js |
diffstat | 2 files changed, 40 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/codegen/Attr.java Wed Jul 03 15:46:03 2013 +0200 +++ b/src/jdk/nashorn/internal/codegen/Attr.java Thu Jul 04 17:27:33 2013 +0200 @@ -791,6 +791,9 @@ } type = Type.widest(type, newCaseNode.getTest().getType()); + if (type.isBoolean()) { + type = Type.OBJECT; //booleans and integers aren't assignment compatible + } } newCases.add(newCaseNode);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8019821.js Thu Jul 04 17:27:33 2013 +0200 @@ -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: + } +}