Mercurial > hg > openjdk > lambda > nashorn
changeset 575:821b0b610861
8025080: Object literal getter, setter function with number format property name results in ClassFormatError
Reviewed-by: lagergren, hannesw
author | sundar |
---|---|
date | Thu, 19 Sep 2013 21:20:47 +0530 |
parents | 740b1133f1b6 |
children | 18d64bc4937d |
files | src/jdk/nashorn/internal/ir/debug/JSONWriter.java src/jdk/nashorn/internal/parser/Parser.java test/script/basic/JDK-8025080.js test/script/basic/JDK-8025080.js.EXPECTED test/script/basic/parser/objectLitExpr.js.EXPECTED |
diffstat | 5 files changed, 54 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/ir/debug/JSONWriter.java Thu Sep 19 15:39:01 2013 +0200 +++ b/src/jdk/nashorn/internal/ir/debug/JSONWriter.java Thu Sep 19 21:20:47 2013 +0530 @@ -410,7 +410,8 @@ comma(); property("id"); - if (functionNode.isAnonymous()) { + final FunctionNode.Kind kind = functionNode.getKind(); + if (functionNode.isAnonymous() || kind == FunctionNode.Kind.GETTER || kind == FunctionNode.Kind.SETTER) { nullValue(); } else { functionNode.getIdent().accept(this);
--- a/src/jdk/nashorn/internal/parser/Parser.java Thu Sep 19 15:39:01 2013 +0200 +++ b/src/jdk/nashorn/internal/parser/Parser.java Thu Sep 19 21:20:47 2013 +0530 @@ -59,6 +59,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import jdk.internal.dynalink.support.NameCodec; import jdk.nashorn.internal.codegen.CompilerConstants; import jdk.nashorn.internal.codegen.Namespace; import jdk.nashorn.internal.ir.AccessNode; @@ -2108,7 +2109,7 @@ case "get": final PropertyKey getIdent = propertyName(); final String getterName = getIdent.getPropertyName(); - final IdentNode getNameNode = new IdentNode(((Node)getIdent).getToken(), finish, "get " + getterName); + final IdentNode getNameNode = new IdentNode(((Node)getIdent).getToken(), finish, "get " + NameCodec.encode(getterName)); expect(LPAREN); expect(RPAREN); functionNode = functionBody(getSetToken, getNameNode, new ArrayList<IdentNode>(), FunctionNode.Kind.GETTER); @@ -2117,7 +2118,7 @@ case "set": final PropertyKey setIdent = propertyName(); final String setterName = setIdent.getPropertyName(); - final IdentNode setNameNode = new IdentNode(((Node)setIdent).getToken(), finish, "set " + setterName); + final IdentNode setNameNode = new IdentNode(((Node)setIdent).getToken(), finish, "set " + NameCodec.encode(setterName)); expect(LPAREN); final IdentNode argIdent = getIdent(); verifyStrictIdent(argIdent, "setter argument");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8025080.js Thu Sep 19 21:20:47 2013 +0530 @@ -0,0 +1,43 @@ +/* + * 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-8025080: Object literal getter, setter function with number format property name results in ClassFormatError + * + * @test + * @run + */ + +var obj = { + get 1e81() { print("1e81 getter"); }, + set 1e81(x) { print("1e81 setter"); }, + get 3.14e-2() { print("3.14e-2 getter");}, + set 3.14e-2(x) { print("3.14e-2 setter"); } +}; + +obj[1e81]; +obj[1e81] = 23; + +obj[3.14e-2]; +obj[3.14e-2] = 42; +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8025080.js.EXPECTED Thu Sep 19 21:20:47 2013 +0530 @@ -0,0 +1,4 @@ +1e81 getter +1e81 setter +3.14e-2 getter +3.14e-2 setter
--- a/test/script/basic/parser/objectLitExpr.js.EXPECTED Thu Sep 19 15:39:01 2013 +0200 +++ b/test/script/basic/parser/objectLitExpr.js.EXPECTED Thu Sep 19 21:20:47 2013 +0530 @@ -126,10 +126,7 @@ }, "value": { "type": "FunctionExpression", - "id": { - "type": "Identifier", - "name": "get x" - }, + "id": null, "params": [], "defaults": [], "rest": null, @@ -157,10 +154,7 @@ }, "value": { "type": "FunctionExpression", - "id": { - "type": "Identifier", - "name": "get y" - }, + "id": null, "params": [], "defaults": [], "rest": null,