Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/codegen/Attr.java	Thu Feb 14 13:22:26 2013 +0100
     1.2 +++ b/src/jdk/nashorn/internal/codegen/Attr.java	Thu Feb 14 13:52:12 2013 +0100
     1.3 @@ -542,6 +542,10 @@
     1.4                              caseNode.setTest(LiteralNode.newInstance(lit, lit.getInt32()).accept(this));
     1.5                          }
     1.6                      }
     1.7 +                } else {
     1.8 +                    // the "all integer" case that CodeGenerator optimizes for currently assumes literals only
     1.9 +                    type = Type.OBJECT;
    1.10 +                    break;
    1.11                  }
    1.12  
    1.13                  type = Type.widest(type, caseNode.getTest().getType());

     2.1 --- a/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Thu Feb 14 13:22:26 2013 +0100
     2.2 +++ b/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Thu Feb 14 13:52:12 2013 +0100
     2.3 @@ -1803,7 +1803,7 @@
     2.4                  final Node test = caseNode.getTest();
     2.5  
     2.6                  if (test != null) {
     2.7 -                    final Integer value = (Integer)((LiteralNode<?>) test).getValue();
     2.8 +                    final Integer value = (Integer)((LiteralNode<?>)test).getValue();
     2.9                      final Label   entry = caseNode.getEntry();
    2.10  
    2.11                      // Take first duplicate.

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/script/basic/JDK-8008206.js	Thu Feb 14 13:52:12 2013 +0100
     3.3 @@ -0,0 +1,36 @@
     3.4 +/*
     3.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     3.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3.7 + * 
     3.8 + * This code is free software; you can redistribute it and/or modify it
     3.9 + * under the terms of the GNU General Public License version 2 only, as
    3.10 + * published by the Free Software Foundation.
    3.11 + * 
    3.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    3.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    3.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    3.15 + * version 2 for more details (a copy is included in the LICENSE file that
    3.16 + * accompanied this code).
    3.17 + * 
    3.18 + * You should have received a copy of the GNU General Public License version
    3.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    3.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    3.21 + * 
    3.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    3.23 + * or visit www.oracle.com if you need additional information or have any
    3.24 + * questions.
    3.25 + */
    3.26 +
    3.27 +/**
    3.28 + * JDK-8008026 : allInteger case in Switch nodes requiers integer literals only
    3.29 + *
    3.30 + * @test
    3.31 + * @run
    3.32 + */
    3.33 +
    3.34 +var x = 1; 
    3.35 +
    3.36 +switch (x) { 
    3.37 +  case foo = false, 1: 
    3.38 +     print("ok"); 
    3.39 +} 

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/test/script/basic/JDK-8008206.js.EXPECTED	Thu Feb 14 13:52:12 2013 +0100
     4.3 @@ -0,0 +1,1 @@
     4.4 +ok