Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Fri Nov 11 15:50:51 2016 +0100
     1.2 +++ b/src/jdk/nashorn/internal/codegen/CodeGenerator.java	Thu Dec 01 14:37:39 2016 +0100
     1.3 @@ -4016,7 +4016,7 @@
     1.4                      void loadStack() {
     1.5                          assert assignNode.getWidestOperandType() == Type.INT;
     1.6                          if (isRhsZero(binaryNode)) {
     1.7 -                            loadExpressionAsType(binaryNode.lhs(), Type.INT);
     1.8 +                            loadExpression(binaryNode.lhs(), TypeBounds.INT, true);
     1.9                          } else {
    1.10                              loadBinaryOperands(binaryNode.lhs(), binaryNode.rhs(), TypeBounds.INT, true, false);
    1.11                              method.shr();

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8170594.js	Thu Dec 01 14:37:39 2016 +0100
     2.3 @@ -0,0 +1,45 @@
     2.4 +/*
     2.5 + * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + * 
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + * 
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + * 
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + * 
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/**
    2.28 + * JDK-8170594: >>>=0 generates invalid bytecode for BaseNode LHS
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +var obj1 = {x: "100"};
    2.35 +(function (o, p) {
    2.36 + if (p) {
    2.37 +   o.x >>>= 0;
    2.38 + }
    2.39 +})(obj1, true)
    2.40 +Assert.assertTrue(obj1.x === 100)
    2.41 +
    2.42 +var obj2 = ["100"];
    2.43 +(function (o, p) {
    2.44 + if (p) {
    2.45 +   o[0] >>>= 0;
    2.46 + }
    2.47 +})(obj2, true)
    2.48 +Assert.assertTrue(obj2[0] === 100)