8019821: allInteger switches were confused by boolean cases, as they are a narrower type than int
authorlagergren
Thu, 04 Jul 2013 17:27:33 +0200
changeset 18849 858863c43d1d
parent 18844 f85cfbfb4d11
child 18850 e53ea5f14dd3
8019821: allInteger switches were confused by boolean cases, as they are a narrower type than int Reviewed-by: sundar, hannesw
nashorn/src/jdk/nashorn/internal/codegen/Attr.java
nashorn/test/script/basic/JDK-8019821.js
--- a/nashorn/src/jdk/nashorn/internal/codegen/Attr.java	Wed Jul 03 15:46:03 2013 +0200
+++ b/nashorn/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/nashorn/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:  
+    }
+}