Diff
Modified: trunk/JSTests/ChangeLog (244815 => 244816)
--- trunk/JSTests/ChangeLog 2019-05-01 00:13:08 UTC (rev 244815)
+++ trunk/JSTests/ChangeLog 2019-05-01 00:32:15 UTC (rev 244816)
@@ -1,3 +1,18 @@
+2019-04-30 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r244806.
+ https://bugs.webkit.org/show_bug.cgi?id=197446
+
+ Causing Test262 and JSC test failures on multiple builds
+ (Requested by ShawnRoberts on #webkit).
+
+ Reverted changeset:
+
+ "TypeArrays should not store properties that are canonical
+ numeric indices"
+ https://bugs.webkit.org/show_bug.cgi?id=197228
+ https://trac.webkit.org/changeset/244806
+
2019-04-30 Tadeu Zagallo <[email protected]>
TypeArrays should not store properties that are canonical numeric indices
Deleted: trunk/JSTests/stress/typed-array-canonical-numeric-index-string.js (244815 => 244816)
--- trunk/JSTests/stress/typed-array-canonical-numeric-index-string.js 2019-05-01 00:13:08 UTC (rev 244815)
+++ trunk/JSTests/stress/typed-array-canonical-numeric-index-string.js 2019-05-01 00:32:15 UTC (rev 244816)
@@ -1,88 +0,0 @@
-//@ requireOptions("--forceEagerCompilation=true", "--osrExitCountForReoptimization=10", "--useConcurrentJIT=0")
-
-const typedArrays = [
- Uint8ClampedArray,
- Uint8Array,
- Uint16Array,
- Uint32Array,
- Int8Array,
- Int16Array,
- Int32Array,
- Float32Array,
- Float64Array,
-];
-
-const failures = new Set();
-
-function makeTest(test) {
- noInline(test);
-
- function assert(typedArray, condition, message) {
- if (!condition)
- failures.add(`${typedArray.name}: ${message}`);
- }
-
- function testFor(typedArray, key) {
- key = JSON.stringify(key);
- return new Function('test', 'assert', `
- const value = 42;
- const u8 = new ${typedArray.name}(1);
- u8[${key}] = value;
- test(u8, ${key}, value, assert.bind(undefined, ${typedArray.name}));
- `).bind(undefined, test, assert);
- };
-
- return function(keys) {
- for (let typedArray of typedArrays) {
- for (let key of keys) {
- const runTest = testFor(typedArray, key);
- noInline(runTest);
- for (let i = 0; i < 10; i++) {
- runTest();
- }
- }
- }
- }
-}
-
-const testInvalidIndices = makeTest((array, key, value, assert) => {
- assert(array[key] === undefined, `${key} should not be set`);
- assert(!(key in array), `${key} should not be in array`);
-
- const keys = Object.keys(array);
- assert(keys.length === 1, `no new keys should be added`);
- assert(keys[0] === '0', `'0' should be the only key`);
- assert(array[0] === 0, `offset 0 should not have been modified`);
-});
-
-testInvalidIndices([
- '-0',
- '-1',
- -1,
- 1,
- 'Infinity',
- '-Infinity',
- 'NaN',
- '0.1',
- '4294967294',
- '4294967295',
- '4294967296',
-]);
-
-const testValidIndices = makeTest((array, key, value, assert) => {
- assert(array[key] === value, `${key} should be set to ${value}`);
- assert(key in array, `should contain key ${key}`);
-});
-
-testValidIndices([
- '01',
- '0.10',
- '+Infinity',
- '-NaN',
- '-0.0',
- '0',
- 0,
-]);
-
-if (failures.size)
- throw new Error(`Subtests failed:\n${Array.from(failures).join('\n')}`);
Modified: trunk/LayoutTests/ChangeLog (244815 => 244816)
--- trunk/LayoutTests/ChangeLog 2019-05-01 00:13:08 UTC (rev 244815)
+++ trunk/LayoutTests/ChangeLog 2019-05-01 00:32:15 UTC (rev 244816)
@@ -1,3 +1,18 @@
+2019-04-30 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r244806.
+ https://bugs.webkit.org/show_bug.cgi?id=197446
+
+ Causing Test262 and JSC test failures on multiple builds
+ (Requested by ShawnRoberts on #webkit).
+
+ Reverted changeset:
+
+ "TypeArrays should not store properties that are canonical
+ numeric indices"
+ https://bugs.webkit.org/show_bug.cgi?id=197228
+ https://trac.webkit.org/changeset/244806
+
2019-04-30 Youenn Fablet <[email protected]>
[macOS WK1] ASSERTION FAILED: formData in WebCore::ResourceRequest::doUpdateResourceHTTPBody()
Modified: trunk/LayoutTests/fast/canvas/canvas-ImageData-behaviour-expected.txt (244815 => 244816)
--- trunk/LayoutTests/fast/canvas/canvas-ImageData-behaviour-expected.txt 2019-05-01 00:13:08 UTC (rev 244815)
+++ trunk/LayoutTests/fast/canvas/canvas-ImageData-behaviour-expected.txt 2019-05-01 00:32:15 UTC (rev 244816)
@@ -43,7 +43,7 @@
PASS imageData.data[0] = null, imageData.data[0] is 0
PASS imageData.data[0] = undefined, imageData.data[0] is 0
PASS imageData.data['foo']='garbage',imageData.data['foo'] is 'garbage'
-PASS imageData.data[-1]='garbage',imageData.data[-1] is undefined
+PASS imageData.data[-1]='garbage',imageData.data[-1] is 'garbage'
PASS imageData.data[17]='garbage',imageData.data[17] is undefined
PASS successfullyParsed is true
Modified: trunk/LayoutTests/fast/canvas/canvas-ImageData-behaviour.js (244815 => 244816)
--- trunk/LayoutTests/fast/canvas/canvas-ImageData-behaviour.js 2019-05-01 00:13:08 UTC (rev 244815)
+++ trunk/LayoutTests/fast/canvas/canvas-ImageData-behaviour.js 2019-05-01 00:32:15 UTC (rev 244816)
@@ -21,5 +21,5 @@
}
shouldBe("imageData.data['foo']='garbage',imageData.data['foo']", "'garbage'");
-shouldBe("imageData.data[-1]='garbage',imageData.data[-1]", "undefined");
+shouldBe("imageData.data[-1]='garbage',imageData.data[-1]", "'garbage'");
shouldBe("imageData.data[17]='garbage',imageData.data[17]", "undefined");
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (244815 => 244816)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2019-05-01 00:13:08 UTC (rev 244815)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2019-05-01 00:32:15 UTC (rev 244816)
@@ -857,7 +857,6 @@
runtime/JSGenericTypedArrayViewPrototypeInlines.h
runtime/JSGlobalLexicalEnvironment.h
runtime/JSGlobalObject.h
- runtime/JSGlobalObjectFunctions.h
runtime/JSGlobalObjectInlines.h
runtime/JSImmutableButterfly.h
runtime/JSInternalPromise.h
Modified: trunk/Source/_javascript_Core/ChangeLog (244815 => 244816)
--- trunk/Source/_javascript_Core/ChangeLog 2019-05-01 00:13:08 UTC (rev 244815)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-05-01 00:32:15 UTC (rev 244816)
@@ -1,3 +1,18 @@
+2019-04-30 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r244806.
+ https://bugs.webkit.org/show_bug.cgi?id=197446
+
+ Causing Test262 and JSC test failures on multiple builds
+ (Requested by ShawnRoberts on #webkit).
+
+ Reverted changeset:
+
+ "TypeArrays should not store properties that are canonical
+ numeric indices"
+ https://bugs.webkit.org/show_bug.cgi?id=197228
+ https://trac.webkit.org/changeset/244806
+
2019-04-30 Saam barati <[email protected]>
CodeBlock::m_instructionCount is wrong
Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (244815 => 244816)
--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2019-05-01 00:13:08 UTC (rev 244815)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj 2019-05-01 00:32:15 UTC (rev 244816)
@@ -1669,7 +1669,7 @@
BC18C52E0E16FCE100B34460 /* Lexer.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = BC18C52D0E16FCE100B34460 /* Lexer.lut.h */; };
BC3046070E1F497F003232CF /* Error.h in Headers */ = {isa = PBXBuildFile; fileRef = BC3046060E1F497F003232CF /* Error.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC6AAAE50E1F426500AD87D8 /* ClassInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = BC6AAAE40E1F426500AD87D8 /* ClassInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
- BC756FC90E2031B200DE7D12 /* JSGlobalObjectFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = BC756FC70E2031B200DE7D12 /* JSGlobalObjectFunctions.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ BC756FC90E2031B200DE7D12 /* JSGlobalObjectFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = BC756FC70E2031B200DE7D12 /* JSGlobalObjectFunctions.h */; };
BC87CDB910712AD4000614CF /* JSONObject.lut.h in Headers */ = {isa = PBXBuildFile; fileRef = BC87CDB810712ACA000614CF /* JSONObject.lut.h */; };
BC9041480EB9250900FE26FA /* StructureTransitionTable.h in Headers */ = {isa = PBXBuildFile; fileRef = BC9041470EB9250900FE26FA /* StructureTransitionTable.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC95437D0EBA70FD0072B6D3 /* PropertyMapHashTable.h in Headers */ = {isa = PBXBuildFile; fileRef = BC95437C0EBA70FD0072B6D3 /* PropertyMapHashTable.h */; settings = {ATTRIBUTES = (Private, ); }; };
Modified: trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayViewInlines.h (244815 => 244816)
--- trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayViewInlines.h 2019-05-01 00:13:08 UTC (rev 244815)
+++ trunk/Source/_javascript_Core/runtime/JSGenericTypedArrayViewInlines.h 2019-05-01 00:32:15 UTC (rev 244816)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013-2019 Apple Inc. All rights reserved.
+ * Copyright (C) 2013-2018 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -359,10 +359,7 @@
slot.setValue(thisObject, PropertyAttribute::DontDelete | PropertyAttribute::ReadOnly, jsUndefined());
return false;
}
-
- if (canonicalNumericIndexString(propertyName))
- return false;
-
+
return Base::getOwnPropertySlot(thisObject, exec, propertyName, slot);
}
@@ -378,10 +375,7 @@
// 9.4.5.5-2-b-i Return ? IntegerIndexedElementSet(O, numericIndex, V).
if (Optional<uint32_t> index = parseIndex(propertyName))
return putByIndex(thisObject, exec, index.value(), value, slot.isStrictMode());
-
- if (canonicalNumericIndexString(propertyName))
- return false;
-
+
return Base::put(thisObject, exec, propertyName, value, slot);
}
@@ -416,10 +410,7 @@
}
return true;
}
-
- if (canonicalNumericIndexString(propertyName))
- return false;
-
+
RELEASE_AND_RETURN(scope, Base::defineOwnProperty(thisObject, exec, propertyName, descriptor, shouldThrow));
}
@@ -442,7 +433,7 @@
template<typename Adaptor>
bool JSGenericTypedArrayView<Adaptor>::getOwnPropertySlotByIndex(
- JSObject* object, ExecState*, unsigned propertyName, PropertySlot& slot)
+ JSObject* object, ExecState* exec, unsigned propertyName, PropertySlot& slot)
{
JSGenericTypedArrayView* thisObject = jsCast<JSGenericTypedArrayView*>(object);
@@ -451,8 +442,10 @@
return true;
}
- if (propertyName > MAX_ARRAY_INDEX)
- return false;
+ if (propertyName > MAX_ARRAY_INDEX) {
+ return thisObject->methodTable(exec->vm())->getOwnPropertySlot(
+ thisObject, exec, Identifier::from(exec, propertyName), slot);
+ }
if (!thisObject->canGetIndexQuickly(propertyName))
return false;
@@ -463,12 +456,14 @@
template<typename Adaptor>
bool JSGenericTypedArrayView<Adaptor>::putByIndex(
- JSCell* cell, ExecState* exec, unsigned propertyName, JSValue value, bool)
+ JSCell* cell, ExecState* exec, unsigned propertyName, JSValue value, bool shouldThrow)
{
JSGenericTypedArrayView* thisObject = jsCast<JSGenericTypedArrayView*>(cell);
- if (propertyName > MAX_ARRAY_INDEX)
- return false;
+ if (propertyName > MAX_ARRAY_INDEX) {
+ PutPropertySlot slot(JSValue(thisObject), shouldThrow);
+ return thisObject->methodTable(exec->vm())->put(thisObject, exec, Identifier::from(exec, propertyName), value, slot);
+ }
return thisObject->setIndex(exec, propertyName, value);
}
Modified: trunk/Source/_javascript_Core/runtime/JSTypedArrays.cpp (244815 => 244816)
--- trunk/Source/_javascript_Core/runtime/JSTypedArrays.cpp 2019-05-01 00:13:08 UTC (rev 244815)
+++ trunk/Source/_javascript_Core/runtime/JSTypedArrays.cpp 2019-05-01 00:32:15 UTC (rev 244816)
@@ -55,5 +55,6 @@
return JSUint8Array::create(exec, structure, WTFMove(buffer), byteOffset, length);
}
+
} // namespace JSC
Modified: trunk/Source/_javascript_Core/runtime/PropertyName.h (244815 => 244816)
--- trunk/Source/_javascript_Core/runtime/PropertyName.h 2019-05-01 00:13:08 UTC (rev 244815)
+++ trunk/Source/_javascript_Core/runtime/PropertyName.h 2019-05-01 00:32:15 UTC (rev 244816)
@@ -26,10 +26,8 @@
#pragma once
#include "Identifier.h"
-#include "JSGlobalObjectFunctions.h"
#include "PrivateName.h"
#include <wtf/Optional.h>
-#include <wtf/dtoa.h>
namespace JSC {
@@ -132,18 +130,4 @@
return parseIndex(*uid);
}
-// https://www.ecma-international.org/ecma-262/9.0/index.html#sec-canonicalnumericindexstring
-ALWAYS_INLINE Optional<double> canonicalNumericIndexString(const PropertyName& propertyName)
-{
- StringImpl* property = propertyName.uid();
- if (equal(property, "-0"))
- return { -0.0 };
- double index = jsToNumber(property);
- NumberToStringBuffer buffer;
- const char* indexString = WTF::numberToString(index, buffer);
- if (!equal(property, indexString))
- return WTF::nullopt;
- return { index };
-}
-
} // namespace JSC
