diff options
author | attila <none@none> | 2016-12-01 14:37:39 +0100 |
---|---|---|
committer | attila <none@none> | 2016-12-01 14:37:39 +0100 |
commit | ffa2072fb8161a21b86684fa8f701f309d8d434f (patch) | |
tree | 72162cc7fefcc01c20bad7954ba5f5dc404651ed | |
parent | 30880858a4b948a6ab9c812eb63ec16a9ea3fb05 (diff) | |
download | jdk8u_nashorn-ffa2072fb8161a21b86684fa8f701f309d8d434f.tar.gz |
8170594: >>>=0 generates invalid bytecode for BaseNode LHS
Reviewed-by: jlaskey, sundar
-rw-r--r-- | src/jdk/nashorn/internal/codegen/CodeGenerator.java | 2 | ||||
-rw-r--r-- | test/script/basic/JDK-8170594.js | 45 |
2 files changed, 46 insertions, 1 deletions
diff --git a/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/src/jdk/nashorn/internal/codegen/CodeGenerator.java index b2a31646..6b9b731f 100644 --- a/src/jdk/nashorn/internal/codegen/CodeGenerator.java +++ b/src/jdk/nashorn/internal/codegen/CodeGenerator.java @@ -4016,7 +4016,7 @@ final class CodeGenerator extends NodeOperatorVisitor<CodeGeneratorLexicalContex 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(); diff --git a/test/script/basic/JDK-8170594.js b/test/script/basic/JDK-8170594.js new file mode 100644 index 00000000..6365500a --- /dev/null +++ b/test/script/basic/JDK-8170594.js @@ -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) |