Diff
Modified: trunk/JSTests/stress/typedarray-functions-with-neutered.js (294932 => 294933)
--- trunk/JSTests/stress/typedarray-functions-with-neutered.js 2022-05-27 06:23:44 UTC (rev 294932)
+++ trunk/JSTests/stress/typedarray-functions-with-neutered.js 2022-05-27 06:57:47 UTC (rev 294933)
@@ -77,9 +77,7 @@
prototypeFunctions = [
{ func:proto.copyWithin, args:["prim", "prim", "prim"] },
{ func:proto.fill, args:["prim", "prim", "prim"] },
- { func:proto.set, args:["array", "prim"] },
{ func:proto.slice, args:["prim", "prim"] },
- { func:proto.sort, args:["func"] },
{ func:proto.subarray, args:["prim", "prim"] },
];
Modified: trunk/JSTests/test262/expectations.yaml (294932 => 294933)
--- trunk/JSTests/test262/expectations.yaml 2022-05-27 06:23:44 UTC (rev 294932)
+++ trunk/JSTests/test262/expectations.yaml 2022-05-27 06:57:47 UTC (rev 294933)
@@ -1092,12 +1092,6 @@
test/built-ins/Temporal/getOwnPropertyNames.js:
default: 'Test262Error: PlainDateTime'
strict mode: 'Test262Error: PlainDateTime'
-test/built-ins/TypedArray/prototype/set/array-arg-targetbuffer-detached-on-get-src-value-no-throw.js:
- default: 'TypeError: Underlying ArrayBuffer has been detached from the view (Testing with Float64Array.)'
- strict mode: 'TypeError: Underlying ArrayBuffer has been detached from the view (Testing with Float64Array.)'
-test/built-ins/TypedArray/prototype/sort/sort-tonumber.js:
- default: 'TypeError: Underlying ArrayBuffer has been detached from the view (Testing with Float64Array.)'
- strict mode: 'TypeError: Underlying ArrayBuffer has been detached from the view (Testing with Float64Array.)'
test/harness/temporalHelpers-one-shift-time-zone.js:
default: "TypeError: undefined is not a constructor (evaluating 'new Temporal.PlainDateTime(2021, 3, 28, 1)')"
strict mode: "TypeError: undefined is not a constructor (evaluating 'new Temporal.PlainDateTime(2021, 3, 28, 1)')"
Modified: trunk/LayoutTests/js/typed-array-mutated-during-set-expected.txt (294932 => 294933)
--- trunk/LayoutTests/js/typed-array-mutated-during-set-expected.txt 2022-05-27 06:23:44 UTC (rev 294932)
+++ trunk/LayoutTests/js/typed-array-mutated-during-set-expected.txt 2022-05-27 06:57:47 UTC (rev 294933)
@@ -5,7 +5,7 @@
PASS buffer.byteLength is 100
PASS buffer.byteLength is 0
-PASS byteArray.set(array) threw exception TypeError: Underlying ArrayBuffer has been detached from the view.
+PASS byteArray.set(array) threw exception success.
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/js/typed-array-mutated-during-set.html (294932 => 294933)
--- trunk/LayoutTests/js/typed-array-mutated-during-set.html 2022-05-27 06:23:44 UTC (rev 294932)
+++ trunk/LayoutTests/js/typed-array-mutated-during-set.html 2022-05-27 06:57:47 UTC (rev 294933)
@@ -22,7 +22,7 @@
};
var errorCreator = {
valueOf: function() {
- throw "fail"
+ throw "success";
}
};
Modified: trunk/Source/_javascript_Core/builtins/TypedArrayPrototype.js (294932 => 294933)
--- trunk/Source/_javascript_Core/builtins/TypedArrayPrototype.js 2022-05-27 06:23:44 UTC (rev 294932)
+++ trunk/Source/_javascript_Core/builtins/TypedArrayPrototype.js 2022-05-27 06:57:47 UTC (rev 294933)
@@ -167,19 +167,6 @@
}
@globalPrivate
-function typedArrayElementCompare(array, a, b, comparator)
-{
- "use strict";
-
- var result = @toNumber(comparator(a, b));
-
- if (@isDetached(array))
- @throwTypeError("Underlying ArrayBuffer has been detached from the view");
-
- return result;
-}
-
-@globalPrivate
function typedArrayMerge(array, dst, src, srcIndex, srcEnd, width, comparator)
{
"use strict";
@@ -191,7 +178,7 @@
for (var dstIndex = left; dstIndex < rightEnd; ++dstIndex) {
if (right < rightEnd) {
- if (left >= leftEnd || @typedArrayElementCompare(array, src[right], src[left], comparator) < 0) {
+ if (left >= leftEnd || @toNumber(comparator(src[right], src[left])) < 0) {
dst[dstIndex] = src[right++];
continue;
}
Modified: trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayView.h (294932 => 294933)
--- trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayView.h 2022-05-27 06:23:44 UTC (rev 294932)
+++ trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayView.h 2022-05-27 06:57:47 UTC (rev 294933)
@@ -170,7 +170,10 @@
typename Adaptor::Type value = toNativeFromValue<Adaptor>(globalObject, jsValue);
RETURN_IF_EXCEPTION(scope, false);
- if (isDetached() || i >= m_length)
+ if (isDetached())
+ return true;
+
+ if (i >= m_length)
return false;
setIndexQuicklyToNativeValue(i, value);
Modified: trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayViewInlines.h (294932 => 294933)
--- trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayViewInlines.h 2022-05-27 06:23:44 UTC (rev 294932)
+++ trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayViewInlines.h 2022-05-27 06:57:47 UTC (rev 294933)
@@ -324,16 +324,6 @@
if (!success)
return false;
- auto trySetIndex = [&](size_t index, JSValue value) -> bool {
- bool success = setIndex(globalObject, index, value);
- EXCEPTION_ASSERT(!scope.exception() || !success);
- if (!success) {
- if (isDetached())
- throwTypeError(globalObject, scope, typedArrayBufferHasBeenDetachedErrorMessage);
- return false;
- }
- return true;
- };
// It is not valid to ever call object->get() with an index of more than MAX_ARRAY_INDEX.
// So we iterate in the optimized loop up to MAX_ARRAY_INDEX, then if there is anything to do beyond this, we rely on slower code.
size_t safeUnadjustedLength = std::min(length, static_cast<size_t>(MAX_ARRAY_INDEX) + 1);
@@ -342,7 +332,9 @@
ASSERT(i + objectOffset <= MAX_ARRAY_INDEX);
JSValue value = object->get(globalObject, static_cast<unsigned>(i + objectOffset));
RETURN_IF_EXCEPTION(scope, false);
- if (!trySetIndex(offset + i, value))
+ bool success = setIndex(globalObject, offset + i, value);
+ EXCEPTION_ASSERT(!scope.exception() || !success);
+ if (!success)
return false;
}
for (size_t i = safeLength; i < length; ++i) {
@@ -349,7 +341,9 @@
Identifier ident = Identifier::from(vm, static_cast<uint64_t>(i + objectOffset));
JSValue value = object->get(globalObject, ident);
RETURN_IF_EXCEPTION(scope, false);
- if (!trySetIndex(offset + i, value))
+ bool success = setIndex(globalObject, offset + i, value);
+ EXCEPTION_ASSERT(!scope.exception() || !success);
+ if (!success)
return false;
}
return true;
