Skip to content

D
dragonwell11

openanolis / dragonwell11

通知 7
Star 2
Fork 0
D
dragonwell11

体验新版 GitCode，发现更多精彩内容 >>

提交 fc80bd4d 编写于 作者: H hannesw
浏览文件
操作

8012291: NativeArray is inconsistent in using long for length and index in... 

8012291: NativeArray is inconsistent in using long for length and index in some places and int for the same in other places
Reviewed-by: lagergren, jlaskey
上级 934118c0
展开全部 显示空白变更内容
内联 并排
Showing with 367 addition and 251 deletion
nashorn/src/jdk/nashorn/internal/codegen/FieldObjectCreator.java
浏览文件 @ fc80bd4d
......@@ -126,7 +126,7 @@ public abstract class FieldObjectCreator<T> extends ObjectCreator {
final T value = valueIter.next();
if (symbol != null && value != null) {
final int index = ArrayIndex.getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (index < 0) {
putField(method, key, symbol.getFieldIndex(), value);
......
nashorn/src/jdk/nashorn/internal/codegen/MapCreator.java
浏览文件 @ fc80bd4d
......@@ -79,7 +79,7 @@ public class MapCreator {
final String key = keys[i];
final Symbol symbol = symbols[i];
if (symbol != null && !ArrayIndex.isIndexKey(key)) {
if (symbol != null && !ArrayIndex.isIntArrayIndex(key)) {
properties.add(new AccessorProperty(key, getPropertyFlags(symbol, hasArguments), structure, symbol.getFieldIndex()));
}
}
......
nashorn/src/jdk/nashorn/internal/objects/ArrayBufferView.java
浏览文件 @ fc80bd4d
......@@ -33,6 +33,8 @@ import jdk.nashorn.internal.runtime.ScriptObject;
import jdk.nashorn.internal.runtime.ScriptRuntime;
import jdk.nashorn.internal.runtime.arrays.ArrayData;
import static jdk.nashorn.internal.runtime.ECMAErrors.rangeError;
@ScriptClass("ArrayBufferView")
abstract class ArrayBufferView extends ScriptObject {
......@@ -305,11 +307,11 @@ abstract class ArrayBufferView extends ScriptObject {
dst = factory.construct(length);
} else if (arg0 instanceof NativeArray) {
// Constructor(type[] array)
length = (int) (((NativeArray) arg0).getArray().length() & 0x7fff_ffff);
length = lengthToInt(((NativeArray) arg0).getArray().length());
dst = factory.construct(length);
} else {
// Constructor(unsigned long length)
length = JSType.toInt32(arg0);
length = lengthToInt(JSType.toInt64(arg0));
return factory.construct(length);
}
......@@ -354,6 +356,13 @@ abstract class ArrayBufferView extends ScriptObject {
}
}
private static int lengthToInt(final long length) {
if (length > Integer.MAX_VALUE || length < 0) {
throw rangeError("inappropriate.array.buffer.length", JSType.toString(length));
}
return (int) (length & Integer.MAX_VALUE);
}
protected static Object subarrayImpl(final Object self, final Object begin0, final Object end0) {
final ArrayBufferView arrayView = ((ArrayBufferView)self);
final int elementLength = arrayView.elementLength();
......
nashorn/src/jdk/nashorn/internal/objects/NativeArguments.java
浏览文件 @ fc80bd4d
......@@ -27,7 +27,6 @@ package jdk.nashorn.internal.objects;
import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndexNoThrow;
import static jdk.nashorn.internal.lookup.Lookup.MH;
import java.lang.invoke.MethodHandle;
......@@ -132,103 +131,103 @@ public final class NativeArguments extends ScriptObject {
@Override
public int getInt(final Object key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getInt(index) : super.getInt(key);
}
@Override
public int getInt(final double key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getInt(index) : super.getInt(key);
}
@Override
public int getInt(final long key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getInt(index) : super.getInt(key);
}
@Override
public int getInt(final int key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getInt(index) : super.getInt(key);
}
@Override
public long getLong(final Object key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getLong(index) : super.getLong(key);
}
@Override
public long getLong(final double key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getLong(index) : super.getLong(key);
}
@Override
public long getLong(final long key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getLong(index) : super.getLong(key);
}
@Override
public long getLong(final int key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getLong(index) : super.getLong(key);
}
@Override
public double getDouble(final Object key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getDouble(index) : super.getDouble(key);
}
@Override
public double getDouble(final double key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getDouble(index) : super.getDouble(key);
}
@Override
public double getDouble(final long key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getDouble(index) : super.getDouble(key);
}
@Override
public double getDouble(final int key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getDouble(index) : super.getDouble(key);
}
@Override
public Object get(final Object key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getObject(index) : super.get(key);
}
@Override
public Object get(final double key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getObject(index) : super.get(key);
}
@Override
public Object get(final long key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getObject(index) : super.get(key);
}
@Override
public Object get(final int key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) ? namedArgs.getObject(index) : super.get(key);
}
@Override
public void set(final Object key, final int value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -238,7 +237,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final Object key, final long value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -248,7 +247,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final Object key, final double value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -258,7 +257,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final Object key, final Object value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -268,7 +267,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final double key, final int value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -278,7 +277,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final double key, final long value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -288,7 +287,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final double key, final double value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -298,7 +297,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final double key, final Object value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -308,7 +307,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final long key, final int value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -318,7 +317,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final long key, final long value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -328,7 +327,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final long key, final double value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -338,7 +337,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final long key, final Object value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -348,7 +347,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final int key, final int value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -358,7 +357,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final int key, final long value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -368,7 +367,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final int key, final double value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -378,7 +377,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public void set(final int key, final Object value, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (isMapped(index)) {
namedArgs = namedArgs.set(index, value, strict);
} else {
......@@ -388,55 +387,55 @@ public final class NativeArguments extends ScriptObject {
@Override
public boolean has(final Object key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) || super.has(key);
}
@Override
public boolean has(final double key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) || super.has(key);
}
@Override
public boolean has(final long key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) || super.has(key);
}
@Override
public boolean has(final int key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) || super.has(key);
}
@Override
public boolean hasOwnProperty(final Object key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) || super.hasOwnProperty(key);
}
@Override
public boolean hasOwnProperty(final int key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) || super.hasOwnProperty(key);
}
@Override
public boolean hasOwnProperty(final long key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) || super.hasOwnProperty(key);
}
@Override
public boolean hasOwnProperty(final double key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isMapped(index) || super.hasOwnProperty(key);
}
@Override
public boolean delete(final int key, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
final boolean success = super.delete(key, strict);
if (success && namedArgs.has(index)) {
setDeleted(index);
......@@ -446,7 +445,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public boolean delete(final long key, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
final boolean success = super.delete(key, strict);
if (success && namedArgs.has(index)) {
setDeleted(index);
......@@ -456,7 +455,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public boolean delete(final double key, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
final boolean success = super.delete(key, strict);
if (success && namedArgs.has(index)) {
setDeleted(index);
......@@ -466,7 +465,7 @@ public final class NativeArguments extends ScriptObject {
@Override
public boolean delete(final Object key, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
final boolean success = super.delete(key, strict);
if (success && namedArgs.has(index)) {
setDeleted(index);
......@@ -480,7 +479,7 @@ public final class NativeArguments extends ScriptObject {
*/
@Override
public boolean defineOwnProperty(final String key, final Object propertyDesc, final boolean reject) {
final int index = ArrayIndex.getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (index >= 0) {
final boolean allowed = super.defineOwnProperty(key, propertyDesc, false);
if (!allowed) {
......
nashorn/src/jdk/nashorn/internal/objects/NativeArray.java
浏览文件 @ fc80bd4d
......@@ -228,7 +228,7 @@ public final class NativeArray extends ScriptObject {
}
// Step 4a
final int index = ArrayIndex.getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (ArrayIndex.isValidArrayIndex(index)) {
final long longIndex = ArrayIndex.toLongIndex(index);
// Step 4b
......@@ -770,7 +770,7 @@ public final class NativeArray extends ScriptObject {
final NativeArray copy = new NativeArray(0);
for (long n = 0; k < finale; n++, k++) {
copy.defineOwnProperty((int) n, sobj.get(k));
copy.defineOwnProperty(ArrayIndex.getArrayIndex(n), sobj.get(k));
}
return copy;
......@@ -835,28 +835,26 @@ public final class NativeArray extends ScriptObject {
final ScriptObject sobj = (ScriptObject) self;
final boolean strict = sobj.isStrictContext();
final long len = JSType.toUint32(sobj.getLength());
ArrayData array = sobj.getArray();
if (len > 1) {
// Get only non-missing elements. Missing elements go at the end
// of the sorted array. So, just don't copy these to sort input.
final ArrayList<Object> src = new ArrayList<>();
for (int i = 0; i < (int)len; i++) {
if (sobj.has(i)) {
src.add(sobj.get(i));
for (long i = 0; i < len; i = array.nextIndex(i)) {
if (array.has((int) i)) {
src.add(array.getObject((int) i));
}
}
final Object[] sorted = sort(src.toArray(), comparefn);
for (int i = 0; i < sorted.length; i++) {
sobj.set(i, sorted[i], strict);
array = array.set(i, sorted[i], strict);
}
// delete missing elements - which are at the end of sorted array
for (int j = sorted.length; j < (int)len; j++) {
sobj.delete(j, strict);
}
sobj.setArray(array.delete(sorted.length, len - 1));
}
return sobj;
......@@ -906,7 +904,7 @@ public final class NativeArray extends ScriptObject {
final long from = actualStart + k;
if (sobj.has(from)) {
array.defineOwnProperty((int) k, sobj.get(from));
array.defineOwnProperty(ArrayIndex.getArrayIndex(k), sobj.get(from));
}
}
......@@ -1143,7 +1141,7 @@ public final class NativeArray extends ScriptObject {
@Override
protected boolean forEach(final Object val, final long i) throws Throwable {
final Object r = MAP_CALLBACK_INVOKER.invokeExact(callbackfn, thisArg, val, i, self);
result.defineOwnProperty((int)index, r);
result.defineOwnProperty(ArrayIndex.getArrayIndex(index), r);
return true;
}
......@@ -1172,7 +1170,7 @@ public final class NativeArray extends ScriptObject {
@Override
protected boolean forEach(final Object val, final long i) throws Throwable {
if ((boolean)FILTER_CALLBACK_INVOKER.invokeExact(callbackfn, thisArg, val, i, self)) {
result.defineOwnProperty((int)(to++), val);
result.defineOwnProperty(ArrayIndex.getArrayIndex(to++), val);
}
return true;
}
......
nashorn/src/jdk/nashorn/internal/objects/NativeString.java
浏览文件 @ fc80bd4d
......@@ -29,7 +29,6 @@ import static jdk.nashorn.internal.lookup.Lookup.MH;
import static jdk.nashorn.internal.runtime.ECMAErrors.typeError;
import static jdk.nashorn.internal.runtime.JSType.isRepresentableAsInt;
import static jdk.nashorn.internal.runtime.ScriptRuntime.UNDEFINED;
import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndexNoThrow;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
......@@ -156,7 +155,7 @@ public final class NativeString extends ScriptObject {
@SuppressWarnings("unused")
private static Object get(final Object self, final Object key) {
final CharSequence cs = JSType.toCharSequence(self);
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (index >= 0 && index < cs.length()) {
return String.valueOf(cs.charAt(index));
}
......@@ -191,7 +190,7 @@ public final class NativeString extends ScriptObject {
// String characters can be accessed with array-like indexing..
@Override
public Object get(final Object key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (index >= 0 && index < value.length()) {
return String.valueOf(value.charAt(index));
}
......@@ -284,7 +283,7 @@ public final class NativeString extends ScriptObject {
@Override
public boolean has(final Object key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isValid(index) || super.has(key);
}
......@@ -295,19 +294,19 @@ public final class NativeString extends ScriptObject {
@Override
public boolean has(final long key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isValid(index) || super.has(key);
}
@Override
public boolean has(final double key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isValid(index) || super.has(key);
}
@Override
public boolean hasOwnProperty(final Object key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isValid(index) || super.hasOwnProperty(key);
}
......@@ -318,13 +317,13 @@ public final class NativeString extends ScriptObject {
@Override
public boolean hasOwnProperty(final long key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isValid(index) || super.hasOwnProperty(key);
}
@Override
public boolean hasOwnProperty(final double key) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return isValid(index) || super.hasOwnProperty(key);
}
......@@ -335,19 +334,19 @@ public final class NativeString extends ScriptObject {
@Override
public boolean delete(final long key, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return checkDeleteIndex(index, strict)? false : super.delete(key, strict);
}
@Override
public boolean delete(final double key, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return checkDeleteIndex(index, strict)? false : super.delete(key, strict);
}
@Override
public boolean delete(final Object key, final boolean strict) {
final int index = getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
return checkDeleteIndex(index, strict)? false : super.delete(key, strict);
}
......@@ -364,7 +363,7 @@ public final class NativeString extends ScriptObject {
@Override
public Object getOwnPropertyDescriptor(final String key) {
final int index = ArrayIndex.getArrayIndexNoThrow(key);
final int index = ArrayIndex.getArrayIndex(key);
if (index >= 0 && index < value.length()) {
final Global global = Global.instance();
return global.newDataDescriptor(String.valueOf(value.charAt(index)), false, true, false);
......
nashorn/src/jdk/nashorn/internal/runtime/JSONFunctions.java
浏览文件 @ fc80bd4d
......@@ -25,9 +25,6 @@
package jdk.nashorn.internal.runtime;
import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.getArrayIndexNoThrow;
import static jdk.nashorn.internal.runtime.arrays.ArrayIndex.isValidArrayIndex;
import java.lang.invoke.MethodHandle;
import java.util.Iterator;
import jdk.nashorn.internal.ir.LiteralNode;
......@@ -37,6 +34,7 @@ import jdk.nashorn.internal.ir.PropertyNode;
import jdk.nashorn.internal.ir.UnaryNode;
import jdk.nashorn.internal.parser.JSONParser;
import jdk.nashorn.internal.parser.TokenType;
import jdk.nashorn.internal.runtime.arrays.ArrayIndex;
import jdk.nashorn.internal.runtime.linker.Bootstrap;
/**
......@@ -188,8 +186,8 @@ public final class JSONFunctions {
// add a new property if does not exist already, or else set old property
private static void setPropertyValue(final ScriptObject sobj, final String name, final Object value, final boolean strict) {
final int index = getArrayIndexNoThrow(name);
if (isValidArrayIndex(index)) {
final int index = ArrayIndex.getArrayIndex(name);
if (ArrayIndex.isValidArrayIndex(index)) {
// array index key
sobj.defineOwnProperty(index, value);
} else if (sobj.getMap().findProperty(name) != null) {
......
nashorn/src/jdk/nashorn/internal/runtime/arrays/ArrayIndex.java
浏览文件 @ fc80bd4d
......@@ -44,7 +44,7 @@ public final class ArrayIndex {
/**
* Fast conversion of non-negative integer string to long.
* @param key Key as a string.
* @return long value of string or -1.
* @return long value of string or {@code -1} if string does not represent a valid index.
*/
private static long fromString(final String key) {
long value = 0;
......@@ -52,7 +52,7 @@ public final class ArrayIndex {
// Check for empty string or leading 0
if (length == 0 || (length > 1 && key.charAt(0) == '0')) {
return -1;
return INVALID_ARRAY_INDEX;
}
// Fast toNumber.
......@@ -61,7 +61,7 @@ public final class ArrayIndex {
// If not a digit.
if (digit < '0' || digit > '9') {
return -1;
return INVALID_ARRAY_INDEX;
}
// Insert digit.
......@@ -69,7 +69,7 @@ public final class ArrayIndex {
// Check for overflow (need to catch before wrap around.)
if (value > MAX_ARRAY_INDEX) {
return -1;
return INVALID_ARRAY_INDEX;
}
}
......@@ -81,136 +81,78 @@ public final class ArrayIndex {
* routine needs to perform quickly since all keys are tested with it.
*
* @param key key to check for array index
* @return valid array index, or negative value if not valid
* @return the array index, or {@code -1} if {@code key} does not represent a valid index.
* Note that negative return values other than {@code -1} are considered valid and can be converted to
* the actual index using {@link #toLongIndex(int)}.
*/
public static int getArrayIndexNoThrow(final Object key) {
public static int getArrayIndex(final Object key) {
if (key instanceof Integer) {
return getArrayIndexNoThrow(((Integer)key).intValue());
return getArrayIndex(((Integer) key).intValue());
} else if (key instanceof Number) {
return getArrayIndexNoThrow(((Number)key).doubleValue());
return getArrayIndex(((Number) key).doubleValue());
} else if (key instanceof String) {
return (int)fromString((String)key);
return (int)fromString((String) key);
} else if (key instanceof ConsString) {
return (int)fromString(key.toString());
}
return -1;
return INVALID_ARRAY_INDEX;
}
/**
* Returns a valid array index in an int, if the object represents one
* Returns a valid array index in an int, if the long represents one.
*
* @param key key to check
* @return array index for key
* @throws InvalidArrayIndexException if not a valid array index key
* @return the array index, or {@code -1} if long is not a valid array index.
* Note that negative return values other than {@code -1} are considered valid and can be converted to
* the actual index using {@link #toLongIndex(int)}.
*/
public static int getArrayIndex(final Object key) throws InvalidArrayIndexException {
final int index = getArrayIndexNoThrow(key);
if (index != -1) {
return index;
}
throw new InvalidArrayIndexException(key);
}
/**
* Returns a valid array index in an int, if the long represents one
*
* @param key key to check
* @return valid index or a negative value if long is not a valid array index
*/
public static int getArrayIndexNoThrow(final long key) {
public static int getArrayIndex(final long key) {
if (key >= 0 && key <= MAX_ARRAY_INDEX) {
return (int)key;
}
return -1;
}
/**
* Returns a valid array index in an int, if the long represents one
*
* @param key key to check
* @return valid index for the long
* @throws InvalidArrayIndexException if long is not a valid array index
*/
public static int getArrayIndex(final long key) throws InvalidArrayIndexException {
final int index = getArrayIndexNoThrow(key);
if (index != -1) {
return index;
}
throw new InvalidArrayIndexException(key);
return INVALID_ARRAY_INDEX;
}
/**
* Return a valid index for this double, if it represents one
* Return a valid index for this double, if it represents one.
*
* Doubles that aren't representable exactly as longs/ints aren't working
* array indexes, however, array[1.1] === array["1.1"] in JavaScript.
*
* @param key the key to check
* @return the array index this double represents or a negative value if this isn't an index
* @return the array index this double represents or {@code -1} if this isn't a valid index.
* Note that negative return values other than {@code -1} are considered valid and can be converted to
* the actual index using {@link #toLongIndex(int)}.
*/
public static int getArrayIndexNoThrow(final double key) {
public static int getArrayIndex(final double key) {
if (JSType.isRepresentableAsInt(key)) {
final int intKey = (int)key;
if (intKey >= 0) {
return intKey;
}
} else if (JSType.isRepresentableAsLong(key)) {
return getArrayIndexNoThrow((long)key);
}
return -1;
return getArrayIndex((long) key);
}
/**
* Return a valid array index for this double, if it represents one
*
* Doubles that aren't representable exactly as longs/ints aren't working
* array indexes, however, array[1.1] === array["1.1"] in JavaScript.
*
* @param key the key to check
* @return the array index this double represents
* @throws InvalidArrayIndexException if this isn't an array index
*/
public static int getArrayIndex(final double key) throws InvalidArrayIndexException {
final int index = getArrayIndexNoThrow(key);
if (index != -1) {
return index;
return INVALID_ARRAY_INDEX;
}
throw new InvalidArrayIndexException(key);
}
/**
* Return a valid array index for this string, if it represents one
* Return a valid array index for this string, if it represents one.
*
* @param key the key to check
* @return the array index this string represents or a negative value if this isn't an index
* @return the array index this string represents or {@code -1} if this isn't a valid index.
* Note that negative return values other than {@code -1} are considered valid and can be converted to
* the actual index using {@link #toLongIndex(int)}.
*/
public static int getArrayIndexNoThrow(final String key) {
public static int getArrayIndex(final String key) {
return (int)fromString(key);
}
/**
* Return a valid array index for this string, if it represents one
*
* @param key the key to check
* @return the array index this string represents
* @throws InvalidArrayIndexException if the string isn't an array index
*/
public static int getArrayIndex(final String key) throws InvalidArrayIndexException {
final int index = getArrayIndexNoThrow(key);
if (index != -1) {
return index;
}
throw new InvalidArrayIndexException(key);
}
/**
* Check whether an index is valid as an array index. This check only tests if
* it is the special "invalid array index" type, not if it is e.g. less than zero
......@@ -226,7 +168,7 @@ public final class ArrayIndex {
/**
* Convert an index to a long value. This basically amounts to ANDing it
* with {@link JSType#MAX_UINT}, as the maximum array index in JavaScript
* is 0xffffffff
* is 0xfffffffe
*
* @param index index to convert to long form
* @return index as uint32 in a long
......@@ -236,14 +178,14 @@ public final class ArrayIndex {
}
/**
* Check whether a key string can be used as a valid numeric array index in
* JavaScript
* Check whether a key string represents a valid array index in JavaScript and is small enough
* to fit into a positive int.
*
* @param key the key
* @return true if key works as a valid numeric array index
* @return true if key works as a valid int array index
*/
public static boolean isIndexKey(final String key) {
return ArrayIndex.getArrayIndexNoThrow(key) >= 0;
public static boolean isIntArrayIndex(final String key) {
return getArrayIndex(key) >= 0;
}
}
nashorn/src/jdk/nashorn/internal/runtime/arrays/SparseArrayData.java
浏览文件 @ fc80bd4d
......@@ -61,13 +61,15 @@ class SparseArrayData extends ArrayData {
@Override
public Object[] asObjectArray() {
final Object[] objArray = new Object[Math.min((int) length(), Integer.MAX_VALUE)];
final int length = (int) Math.min(length(), Integer.MAX_VALUE);
final int underlyingLength = (int) Math.min(length, underlying.length());
final Object[] objArray = new Object[length];
for (int i = 0; i < underlying.length(); i++) {
for (int i = 0; i < underlyingLength; i++) {
objArray[i] = underlying.getObject(i);
}
Arrays.fill(objArray, (int) underlying.length(), objArray.length, ScriptRuntime.UNDEFINED);
Arrays.fill(objArray, underlyingLength, length, ScriptRuntime.UNDEFINED);
for (final Map.Entry<Long, Object> entry : sparseMap.entrySet()) {
final long key = entry.getKey();
......
nashorn/src/jdk/nashorn/internal/runtime/resources/Messages.properties
浏览文件 @ fc80bd4d
......@@ -129,6 +129,7 @@ type.error.method.not.constructor=Java method {0} can't be used as a constructor
type.error.env.not.object=$ENV must be an Object.
type.error.unsupported.java.to.type=Unsupported Java.to target type {0}.
range.error.inappropriate.array.length=inappropriate array length: {0}
range.error.inappropriate.array.buffer.length=inappropriate array buffer length: {0}
range.error.invalid.fraction.digits=fractionDigits argument to {0} must be in [0, 20]
range.error.invalid.precision=precision argument toPrecision() must be in [1, 21]
range.error.invalid.radix=radix argument must be in [2, 36]
......
nashorn/test/examples/array-micro.js 0 → 100644
浏览文件 @ fc80bd4d
/*
* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* - Neither the name of Oracle nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
* IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
function bench(name, func) {
var start = Date.now();
for (var iter = 0; iter < 5e6; iter++) {
func();
}
print((Date.now() - start) + "\t" + name);
}
bench("[]", function() {
[];
[];
[];
});
bench("[1, 2, 3]", function() {
[1, 2, 3];
[1, 2, 3];
[1, 2, 3];
});
bench("[1 .. 20]", function() {
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20];
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20];
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20];
});
bench("new Array()", function() {
new Array();
new Array();
new Array();
});
bench("new Array(1, 2, 3)", function() {
new Array(1, 2, 3);
new Array(1, 2, 3);
new Array(1, 2, 3);
});
bench("new Array(10)", function() {
new Array(10);
new Array(10);
new Array(10);
});
var array = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9];
bench("get", function() {
array[0];
array[3];
array[6];
});
bench("set", function() {
array[0] = 0;
array[3] = 3;
array[6] = 6;
});
var all = function(e) { return true; };
var none = function(e) { return false; };
bench("filter all", function() {
array.filter(all);
});
bench("filter none", function() {
array.filter(none);
});
var up = function(a, b) { return a > b ? 1 : -1; };
var down = function(a, b) { return a < b ? 1 : -1; };
bench("sort up", function() {
[1, 2, 3, 4].sort(up);
});
bench("sort down", function() {
[1, 2, 3, 4].sort(down);
});
nashorn/test/script/basic/JDK-8012291.js 0 → 100644
浏览文件 @ fc80bd4d
/*
* 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-8012291: NativeArray is inconsistent in using long for length and index in some places and int for the same in other places
*
* @test
* @run
*/
// Make sure JSON parser correctly handles large array keys
var obj = JSON.parse('{"4294967294": 1}');
print(obj[4294967294]);
// Make sure Array.prototype.sort handles large index correctly
obj.length = 4294967295;
Array.prototype.sort.call(obj);
print(obj[0]);
print(obj[4294967294]);
print(obj.length);
var arr = [];
arr[4294967294] = 1;
try {
new Int32Array(arr);
} catch (e) {
print(e);
}
nashorn/test/script/basic/JDK-8012291.js.EXPECTED 0 → 100644
浏览文件 @ fc80bd4d
1
1
undefined
4294967295
RangeError: inappropriate array buffer length: 4294967295
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或