stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8026805: Array.prototype.length doesn't work as expected

Browse Source 
Reviewed-by: sundar, lagergren
This commit is contained in:
Hannes Wallnöfer 2013-10-18 12:50:21 +02:00
parent d681100033
commit 660aab2c4d
4 changed files with 74 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nashorn/src/jdk/nashorn/internal/objects/Global.java
View File

@ -1665,9 +1665,9 @@ public final class Global extends ScriptObject implements GlobalObject, Scope {
final ScriptObject stringPrototype = getStringPrototype();
stringPrototype.addOwnProperty("length", Attribute.NON_ENUMERABLE_CONSTANT, 0.0);
// add Array.prototype.length
// set isArray flag on Array.prototype
final ScriptObject arrayPrototype = getArrayPrototype();
arrayPrototype.addOwnProperty("length", Attribute.NOT_ENUMERABLE|Attribute.NOT_CONFIGURABLE, 0.0);
arrayPrototype.setIsArray();
this.DEFAULT_DATE = new NativeDate(Double.NaN, this);

24
nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
View File

@ -372,9 +372,7 @@ public final class NativeArray extends ScriptObject {
*/
@Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
public static Object isArray(final Object self, final Object arg) {
return isArray(arg) || (arg == Global.instance().getArrayPrototype())
|| (arg instanceof NativeRegExpExecResult)
|| (arg instanceof JSObject && ((JSObject)arg).isArray());
return isArray(arg) || (arg instanceof JSObject && ((JSObject)arg).isArray());
}
/**
@ -403,6 +401,26 @@ public final class NativeArray extends ScriptObject {
}
}
/**
* Prototype length getter
* @param self self reference
* @return the length of the object
*/
@Getter(name = "length", where = Where.PROTOTYPE, attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE)
public static Object getProtoLength(final Object self) {
return length(self); // Same as instance getter but we can't make nasgen use the same method for prototype
}
/**
* Prototype length setter
* @param self self reference
* @param length new length property
*/
@Setter(name = "length", where = Where.PROTOTYPE, attributes = Attribute.NOT_ENUMERABLE | Attribute.NOT_CONFIGURABLE)
public static void setProtoLength(final Object self, final Object length) {
length(self, length); // Same as instance setter but we can't make nasgen use the same method for prototype
}
static long validLength(final Object length, final boolean reject) {
final double doubleLength = JSType.toNumber(length);
if (!Double.isNaN(doubleLength) && JSType.isRepresentableAsLong(doubleLength)) {

3
nashorn/src/jdk/nashorn/internal/objects/NativeJSAdapter.java
View File

@ -629,7 +629,8 @@ public final class NativeJSAdapter extends ScriptObject {
// to name. Probably not a big deal, but if we can ever make it leaner, it'd be nice.
return new GuardedInvocation(MH.dropArguments(MH.constant(Object.class,
func.makeBoundFunction(this, new Object[] { name })), 0, Object.class),
adaptee.getMap().getProtoGetSwitchPoint(adaptee.getProto(), __call__), testJSAdaptor(adaptee, null, null, null));
adaptee.getMap().getProtoGetSwitchPoint(adaptee.getProto(), __call__),
testJSAdaptor(adaptee, null, null, null));
}
}
throw typeError("no.such.function", desc.getNameToken(2), ScriptRuntime.safeToString(this));

49
nashorn/test/script/basic/JDK-8026805.js Normal file
View File

@ -0,0 +1,49 @@
/*
* 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-8026805: Array.prototype.length doesn't work as expected
*
* @test
* @run
*/
if (Array.prototype.length !== 0) {
throw new Error("Initial length not 0");
}
Array.prototype[3] = 1;
if (Array.prototype.length !== 4) {
throw new Error("length not updated to 4");
}
Array.prototype.length = 0;
if (Array.prototype.length !== 0) {
throw new Error("length not reset to 0");
}
if (3 in Array.prototype) {
throw new Error("array element not deleted");
}