Changeset 215272 in webkit

Timestamp:

Apr 12, 2017 10:35:31 AM (7 years ago)

Author:

msaboff@apple.com

Message:

Implement Object.isFrozen() and Object.isSealed() per ECMA spec
​https://bugs.webkit.org/show_bug.cgi?id=170753

Reviewed by Mark Lam.

JSTests:

Added JSC baseline and enabled defineIndexProperty test.

Note that JSC differs from Chakra in that a JSC doesn't use indexed
properties placed on the Array prototype when sorting the indexed
properties of an Object. This is behavior is considered undefined
in the standard.

• ChakraCore.yaml:
• ChakraCore/test/es5/defineIndexProperty.baseline-jsc: Added.

Source/JavaScriptCore:

• runtime/ObjectConstructor.cpp:

(JSC::testIntegrityLevel): Added local helper as described in the ECMA standard.

(JSC::objectConstructorSeal):
(JSC::objectConstructorFreeze):
Eliminated incomplete special handling of JSFinalObjects.

(JSC::objectConstructorIsSealed):
(JSC::objectConstructorIsFrozen):
Refactored to use the new testIntegrityLevel() helper.

Location:

trunk

Files:

• JSTests/ChakraCore.yaml (modified) (1 diff)
• JSTests/ChakraCore/test/es5/defineIndexProperty.baseline-jsc (added)
• JSTests/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/runtime/ObjectConstructor.cpp (modified) (7 diffs)

trunk/JSTests/ChakraCore.yaml

@@ -1443 +1443 @@
   cmd: runChakra :baseline, "NoException", "defineProperty.baseline", ["../UnitTestFramework/UnitTestFramework.js"]
 - path: ChakraCore/test/es5/defineIndexProperty.js
-  # Differences in Obj.seal, Obj.frozen and sort.
-  cmd: runChakra :skip, "NoException", "defineIndexProperty.baseline", []
+  cmd: runChakra :baseline, "NoException", "defineIndexProperty.baseline-jsc", []
 - path: ChakraCore/test/es5/enumerable.js
   cmd: runChakra :baseline, "NoException", "enumerable.baseline-jsc", []

trunk/JSTests/ChangeLog

@@ +1 @@
+2017-04-11  Michael Saboff  <msaboff@apple.com>
+
+        Implement Object.isFrozen() and Object.isSealed() per ECMA spec
+        https://bugs.webkit.org/show_bug.cgi?id=170753
+
+        Reviewed by Mark Lam.
+
+        Added JSC baseline and enabled defineIndexProperty test.
+
+        Note that JSC differs from Chakra in that a JSC doesn't use indexed
+        properties placed on the Array prototype when sorting the indexed 
+        properties of an Object.  This is behavior is considered undefined
+        in the standard.
+
+        * ChakraCore.yaml:
+        * ChakraCore/test/es5/defineIndexProperty.baseline-jsc: Added.
+
 2017-04-11  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-04-12  Michael Saboff  <msaboff@apple.com>
+
+        Implement Object.isFrozen() and Object.isSealed() per ECMA spec
+        https://bugs.webkit.org/show_bug.cgi?id=170753
+
+        Reviewed by Mark Lam.
+
+        * runtime/ObjectConstructor.cpp:
+        (JSC::testIntegrityLevel): Added local helper as described in the ECMA standard.
+
+        (JSC::objectConstructorSeal):
+        (JSC::objectConstructorFreeze):
+        Eliminated incomplete special handling of JSFinalObjects.
+
+        (JSC::objectConstructorIsSealed):
+        (JSC::objectConstructorIsFrozen):
+        Refactored to use the new testIntegrityLevel() helper.
+
 2017-04-12  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp

@@ -547 +547 @@
     return true;
 }
-    
+
+template<IntegrityLevel level>
+bool testIntegrityLevel(ExecState* exec, VM& vm, JSObject* object)
+{
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
+    // 1. Assert: Type(O) is Object.
+    // 2. Assert: level is either "sealed" or "frozen".
+
+    // 3. Let status be ?IsExtensible(O).
+    bool status = object->isExtensible(exec);
+    RETURN_IF_EXCEPTION(scope, { });
+
+    // 4. If status is true, return false.
+    if (status)
+        return false;
+
+    // 6. Let keys be ? O.[[OwnPropertyKeys]]().
+    PropertyNameArray keys(exec, PropertyNameMode::StringsAndSymbols);
+    object->methodTable(vm)->getOwnPropertyNames(object, exec, keys, EnumerationMode(DontEnumPropertiesMode::Include));
+    RETURN_IF_EXCEPTION(scope, { });
+
+    // 7. For each element k of keys, do
+    PropertyNameArray::const_iterator end = keys.end();
+    for (PropertyNameArray::const_iterator iter = keys.begin(); iter != end; ++iter) {
+        Identifier propertyName = *iter;
+        if (vm.propertyNames->isPrivateName(propertyName))
+            continue;
+
+        // a. Let currentDesc be ? O.[[GetOwnProperty]](k)
+        PropertyDescriptor desc;
+        bool didGetDescriptor = object->getOwnPropertyDescriptor(exec, propertyName, desc);
+        RETURN_IF_EXCEPTION(scope, { });
+
+        // b. If currentDesc is not undefined, then
+        if (!didGetDescriptor)
+            continue;
+
+        // i. If currentDesc.[[Configurable]] is true, return false.
+        if (desc.configurable())
+            return false;
+
+        // ii. If level is "frozen" and IsDataDescriptor(currentDesc) is true, then
+        // 1. If currentDesc.[[Writable]] is true, return false.
+        if (level == IntegrityLevel::Frozen && desc.isDataDescriptor() && desc.writable())
+            return false;
+    }
+
+    return true;
+}
+
 EncodedJSValue JSC_HOST_CALL objectConstructorSeal(ExecState* exec)
 {
@@ -559 +609 @@
     JSObject* object = asObject(obj);
 
-    if (isJSFinalObject(object)) {
-        object->seal(vm);
-        return JSValue::encode(obj);
-    }
-
     bool success = setIntegrityLevel<IntegrityLevel::Sealed>(exec, vm, object);
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
@@ -578 +623 @@
     VM& vm = exec->vm();
     auto scope = DECLARE_THROW_SCOPE(vm);
-
-    if (isJSFinalObject(object) && !hasIndexedProperties(object->indexingType())) {
-        object->freeze(vm);
-        return object;
-    }
 
     bool success = setIntegrityLevel<IntegrityLevel::Frozen>(exec, vm, object);
@@ -618 +658 @@
 {
     VM& vm = exec->vm();
-    auto scope = DECLARE_THROW_SCOPE(vm);
 
     // 1. If Type(O) is not Object, return true.
@@ -626 +665 @@
     JSObject* object = asObject(obj);
 
-    if (isJSFinalObject(object))
-        return JSValue::encode(jsBoolean(object->isSealed(vm)));
-
-    // 2. For each named own property name P of O,
-    PropertyNameArray properties(exec, PropertyNameMode::StringsAndSymbols);
-    object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
-    RETURN_IF_EXCEPTION(scope, { });
-    PropertyNameArray::const_iterator end = properties.end();
-    for (PropertyNameArray::const_iterator iter = properties.begin(); iter != end; ++iter) {
-        Identifier propertyName = *iter;
-        if (vm.propertyNames->isPrivateName(propertyName))
-            continue;
-        // a. Let desc be the result of calling the [[GetOwnProperty]] internal method of O with P.
-        PropertyDescriptor desc;
-        bool didGetDescriptor = object->getOwnPropertyDescriptor(exec, propertyName, desc);
-        RETURN_IF_EXCEPTION(scope, { });
-        if (!didGetDescriptor)
-            continue;
-        // b. If desc.[[Configurable]] is true, then return false.
-        if (desc.configurable())
-            return JSValue::encode(jsBoolean(false));
-    }
-
-    // 3. If the [[Extensible]] internal property of O is false, then return true.
-    // 4. Otherwise, return false.
-    bool isExtensible = object->isExtensible(exec);
-    RETURN_IF_EXCEPTION(scope, { });
-    return JSValue::encode(jsBoolean(!isExtensible));
+    // 2. Return ? TestIntegrityLevel(O, "sealed").
+    return JSValue::encode(jsBoolean(testIntegrityLevel<IntegrityLevel::Sealed>(exec, vm, object)));
 }
 
@@ -659 +672 @@
 {
     VM& vm = exec->vm();
-    auto scope = DECLARE_THROW_SCOPE(vm);
 
     // 1. If Type(O) is not Object, return true.
@@ -667 +679 @@
     JSObject* object = asObject(obj);
 
-    if (isJSFinalObject(object))
-        return JSValue::encode(jsBoolean(object->isFrozen(vm)));
-
-    // 2. For each named own property name P of O,
-    PropertyNameArray properties(exec, PropertyNameMode::StringsAndSymbols);
-    object->methodTable(vm)->getOwnPropertyNames(object, exec, properties, EnumerationMode(DontEnumPropertiesMode::Include));
-    RETURN_IF_EXCEPTION(scope, { });
-    PropertyNameArray::const_iterator end = properties.end();
-    for (PropertyNameArray::const_iterator iter = properties.begin(); iter != end; ++iter) {
-        Identifier propertyName = *iter;
-        if (vm.propertyNames->isPrivateName(propertyName))
-            continue;
-        // a. Let desc be the result of calling the [[GetOwnProperty]] internal method of O with P.
-        PropertyDescriptor desc;
-        bool didGetDescriptor = object->getOwnPropertyDescriptor(exec, propertyName, desc);
-        RETURN_IF_EXCEPTION(scope, { });
-        if (!didGetDescriptor)
-            continue;
-        // b. If IsDataDescriptor(desc) is true then
-        // i. If desc.[[Writable]] is true, return false. c. If desc.[[Configurable]] is true, then return false.
-        if ((desc.isDataDescriptor() && desc.writable()) || desc.configurable())
-            return JSValue::encode(jsBoolean(false));
-    }
-
-    // 3. If the [[Extensible]] internal property of O is false, then return true.
-    // 4. Otherwise, return false.
-    bool isExtensible = object->isExtensible(exec);
-    RETURN_IF_EXCEPTION(scope, { });
-    return JSValue::encode(jsBoolean(!isExtensible));
+    // 2. Return ? TestIntegrityLevel(O, "frozen").
+    return JSValue::encode(jsBoolean(testIntegrityLevel<IntegrityLevel::Frozen>(exec, vm, object)));
 }