Mercurial > hg > openjdk > jdk9 > nashorn
changeset 1832:dbe7c31e9831
8170594: >>>=0 generates invalid bytecode for BaseNode LHS
Reviewed-by: jlaskey, sundar
author | attila |
---|---|
date | Thu, 01 Dec 2016 14:37:39 +0100 |
parents | ba05e6f3d85c |
children | 0001e717e9f0 |
files | src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java test/script/basic/JDK-8170594.js |
diffstat | 2 files changed, 46 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java Thu Dec 01 18:53:51 2016 +0530 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/CodeGenerator.java Thu Dec 01 14:37:39 2016 +0100 @@ -4066,7 +4066,7 @@ void loadStack() { assert assignNode.getWidestOperandType() == Type.INT; if (isRhsZero(binaryNode)) { - loadExpressionAsType(binaryNode.lhs(), Type.INT); + loadExpression(binaryNode.lhs(), TypeBounds.INT, true); } else { loadBinaryOperands(binaryNode.lhs(), binaryNode.rhs(), TypeBounds.INT, true, false); method.shr();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8170594.js Thu Dec 01 14:37:39 2016 +0100 @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2016 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-8170594: >>>=0 generates invalid bytecode for BaseNode LHS + * + * @test + * @run + */ + +var obj1 = {x: "100"}; +(function (o, p) { + if (p) { + o.x >>>= 0; + } +})(obj1, true) +Assert.assertTrue(obj1.x === 100) + +var obj2 = ["100"]; +(function (o, p) { + if (p) { + o[0] >>>= 0; + } +})(obj2, true) +Assert.assertTrue(obj2[0] === 100)