Changeset 267564 in webkit for trunk/Source/JavaScriptCore/runtime/JSDataView.cpp

Timestamp:

Sep 25, 2020, 4:51:33 AM (5 years ago)

Author:

Alexey Shvayka

Message:

DataView instances should not have own "byteLength" and "byteOffset" properties
​https://bugs.webkit.org/show_bug.cgi?id=149906

Reviewed by Ross Kirsling.

JSTests:

• stress/dataview-no-own-properties.js: Added.

Source/JavaScriptCore:

Following JSDataView::getOwnPropertySlot() deletion in r266529, this patch
removes related method overrides that incorrectly reported "byteLength" and
"byteOffset" as own properties of DataView instances [1].

This change brings DataView objects in compliance with invariants of internal
methods [2] and aligns JSC with V8 and SpiderMonkey.
DataView microbenchmarks are neutral.

[1]: ​https://tc39.es/ecma262/#sec-properties-of-dataview-instances
[2]: ​https://tc39.es/ecma262/#sec-invariants-of-the-essential-internal-methods

• runtime/JSDataView.cpp:

(JSC::JSDataView::put): Deleted.
(JSC::JSDataView::defineOwnProperty): Deleted.
(JSC::JSDataView::deleteProperty): Deleted.
(JSC::JSDataView::getOwnNonIndexPropertyNames): Deleted.

• runtime/JSDataView.h:

LayoutTests:

• inspector/model/remote-object/object-expected.txt:

File:

• trunk/Source/JavaScriptCore/runtime/JSDataView.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/JSDataView.cpp

@@ -105 +105 @@
 }
 
-bool JSDataView::put(
-    JSCell* cell, JSGlobalObject* globalObject, PropertyName propertyName, JSValue value,
-    PutPropertySlot& slot)
-{
-    VM& vm = globalObject->vm();
-    auto scope = DECLARE_THROW_SCOPE(vm);
-    JSDataView* thisObject = jsCast<JSDataView*>(cell);
-
-    if (UNLIKELY(isThisValueAltered(slot, thisObject)))
-        RELEASE_AND_RETURN(scope, ordinarySetSlow(globalObject, thisObject, propertyName, value, slot.thisValue(), slot.isStrictMode()));
-
-    if (propertyName == vm.propertyNames->byteLength
-        || propertyName == vm.propertyNames->byteOffset)
-        return typeError(globalObject, scope, slot.isStrictMode(), "Attempting to write to read-only typed array property."_s);
-
-    RELEASE_AND_RETURN(scope, Base::put(thisObject, globalObject, propertyName, value, slot));
-}
-
-bool JSDataView::defineOwnProperty(
-    JSObject* object, JSGlobalObject* globalObject, PropertyName propertyName,
-    const PropertyDescriptor& descriptor, bool shouldThrow)
-{
-    VM& vm = globalObject->vm();
-    auto scope = DECLARE_THROW_SCOPE(vm);
-    JSDataView* thisObject = jsCast<JSDataView*>(object);
-    if (propertyName == vm.propertyNames->byteLength
-        || propertyName == vm.propertyNames->byteOffset)
-        return typeError(globalObject, scope, shouldThrow, "Attempting to define read-only typed array property."_s);
-
-    RELEASE_AND_RETURN(scope, Base::defineOwnProperty(thisObject, globalObject, propertyName, descriptor, shouldThrow));
-}
-
-bool JSDataView::deleteProperty(
-    JSCell* cell, JSGlobalObject* globalObject, PropertyName propertyName, DeletePropertySlot& slot)
-{
-    VM& vm = globalObject->vm();
-    JSDataView* thisObject = jsCast<JSDataView*>(cell);
-    if (propertyName == vm.propertyNames->byteLength
-        || propertyName == vm.propertyNames->byteOffset)
-        return false;
-
-    return Base::deleteProperty(thisObject, globalObject, propertyName, slot);
-}
-
-void JSDataView::getOwnNonIndexPropertyNames(
-    JSObject* object, JSGlobalObject* globalObject, PropertyNameArray& array, EnumerationMode mode)
-{
-    VM& vm = globalObject->vm();
-    JSDataView* thisObject = jsCast<JSDataView*>(object);
-    
-    if (mode.includeDontEnumProperties()) {
-        array.add(vm.propertyNames->byteOffset);
-        array.add(vm.propertyNames->byteLength);
-    }
-    
-    Base::getOwnNonIndexPropertyNames(thisObject, globalObject, array, mode);
-}
-
 Structure* JSDataView::createStructure(
     VM& vm, JSGlobalObject* globalObject, JSValue prototype)