Mercurial > people > rkennke > jdk9-shenandoah-final > nashorn
changeset 286:f7eb4436410e
8012083: Array literal constant folding issue
Reviewed-by: attila, jlaskey
| author | lagergren |
|---|---|
| date | Thu, 23 May 2013 13:10:58 +0200 |
| parents | 1c1453863ea8 |
| children | 704bc91a0c41 |
| files | src/jdk/nashorn/internal/codegen/CodeGenerator.java src/jdk/nashorn/internal/codegen/FinalizeTypes.java src/jdk/nashorn/internal/codegen/FoldConstants.java test/script/basic/JDK-8012083.js test/script/basic/JDK-8012083.js.EXPECTED |
| diffstat | 5 files changed, 100 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/codegen/CodeGenerator.java Thu May 23 12:01:35 2013 +0200 +++ b/src/jdk/nashorn/internal/codegen/CodeGenerator.java Thu May 23 13:10:58 2013 +0200 @@ -2295,7 +2295,7 @@ @Override public boolean enterADD(final UnaryNode unaryNode) { load(unaryNode.rhs()); - assert unaryNode.rhs().getType().isNumber(); + assert unaryNode.rhs().getType().isNumber() : unaryNode.rhs().getType() + " "+ unaryNode.getSymbol(); method.store(unaryNode.getSymbol()); return false;
--- a/src/jdk/nashorn/internal/codegen/FinalizeTypes.java Thu May 23 12:01:35 2013 +0200 +++ b/src/jdk/nashorn/internal/codegen/FinalizeTypes.java Thu May 23 13:10:58 2013 +0200 @@ -800,7 +800,7 @@ Node resultNode = node; - if (node instanceof LiteralNode && !to.isObject()) { + if (node instanceof LiteralNode && !(node instanceof ArrayLiteralNode) && !to.isObject()) { final LiteralNode<?> newNode = new LiteralNodeConstantEvaluator((LiteralNode<?>)node, to).eval(); if (newNode != null) { resultNode = newNode;
--- a/src/jdk/nashorn/internal/codegen/FoldConstants.java Thu May 23 12:01:35 2013 +0200 +++ b/src/jdk/nashorn/internal/codegen/FoldConstants.java Thu May 23 13:10:58 2013 +0200 @@ -34,6 +34,7 @@ import jdk.nashorn.internal.ir.FunctionNode.CompilationState; import jdk.nashorn.internal.ir.IfNode; import jdk.nashorn.internal.ir.LiteralNode; +import jdk.nashorn.internal.ir.LiteralNode.ArrayLiteralNode; import jdk.nashorn.internal.ir.Node; import jdk.nashorn.internal.ir.TernaryNode; import jdk.nashorn.internal.ir.UnaryNode; @@ -141,6 +142,10 @@ return null; } + if (rhsNode instanceof ArrayLiteralNode) { + return null; + } + final LiteralNode<?> rhs = (LiteralNode<?>)rhsNode; final boolean rhsInteger = rhs.getType().isInteger(); @@ -212,6 +217,10 @@ final LiteralNode<?> lhs = (LiteralNode<?>)parent.lhs(); final LiteralNode<?> rhs = (LiteralNode<?>)parent.rhs(); + if (lhs instanceof ArrayLiteralNode || rhs instanceof ArrayLiteralNode) { + return null; + } + final Type widest = Type.widest(lhs.getType(), rhs.getType()); boolean isInteger = widest.isInteger();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8012083.js Thu May 23 13:10:58 2013 +0200 @@ -0,0 +1,70 @@ +/* + * 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-8012093 - array literals can only be subject to constant evaluation under very special + * circumstances. + * + * @test + * @run + */ + + +var w00t = 17; +print(+[w00t]); + +var empty = []; +print(empty == false); + +print([] == false); +print([] === false); +print(!![]); + +print(~[]); +print(![]); +print(![17]); +print(![17,1,2]); + +var one = 1; +var two = 2; +var a1 = [one]; +var a2 = [two]; +print(+a1 + +a2); //3 + +var x = 1; +print(+["apa"]); +print(+[]); //0 +print(+[1]); //1 +print(+[x]); //1 +print(+[1,2,3]); //NaN +var a = []; +var b = [1]; +print(a/b); +print(++[[]][+[]]+[+[]]); //10 +print(+[] == 0); + +var first = [![]+[]][+[]][+[]]+[![]+[]][+[]][+!+[]]+[!+[]+[]][+![]][+![]]+[![]+[]][+[]][+!+[]]+[![]+[]][+[]][+!+[]+!+[]]; +var second =(![]+[])[+[]]+(![]+[])[+!+[]]+([![]]+[][[]])[+!+[]+[+[]]]+(![]+[])[!+[]+!+[]]; + +print(first + " " + second); +