Changeset 197412 in webkit for trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp

Timestamp:

Mar 1, 2016, 1:45:16 PM (9 years ago)

Author:

[email protected]

Message:

IsExtensible should be a virtual method in the method table
​https://bugs.webkit.org/show_bug.cgi?id=154799

Reviewed by Mark Lam.

This patch makes us more consistent with how the ES6 specification models the
IsExtensible trap. Moving this method into ClassInfo::methodTable
is a prerequisite for implementing Proxy.IsExtensible.

• runtime/ClassInfo.h:
• runtime/JSCell.cpp:

(JSC::JSCell::preventExtensions):
(JSC::JSCell::isExtensible):

• runtime/JSCell.h:
• runtime/JSGlobalObjectFunctions.cpp:

(JSC::globalFuncProtoSetter):

• runtime/JSObject.cpp:

(JSC::JSObject::preventExtensions):
(JSC::JSObject::isExtensible):
(JSC::JSObject::reifyAllStaticProperties):
(JSC::JSObject::defineOwnIndexedProperty):
(JSC::JSObject::putByIndexBeyondVectorLengthWithArrayStorage):
(JSC::JSObject::putDirectIndexBeyondVectorLengthWithArrayStorage):
(JSC::JSObject::defineOwnNonIndexProperty):
(JSC::JSObject::defineOwnProperty):

• runtime/JSObject.h:

(JSC::JSObject::isSealed):
(JSC::JSObject::isFrozen):
(JSC::JSObject::isExtensibleImpl):
(JSC::JSObject::isStructureExtensible):
(JSC::JSObject::isExtensibleInline):
(JSC::JSObject::indexingShouldBeSparse):
(JSC::JSObject::putDirectInternal):
(JSC::JSObject::isExtensible): Deleted.

• runtime/ObjectConstructor.cpp:

(JSC::objectConstructorSetPrototypeOf):
(JSC::objectConstructorIsSealed):
(JSC::objectConstructorIsFrozen):
(JSC::objectConstructorIsExtensible):
(JSC::objectConstructorIs):

• runtime/ProxyObject.cpp:

(JSC::ProxyObject::performInternalMethodGetOwnProperty):
(JSC::ProxyObject::performHasProperty):

• runtime/ReflectObject.cpp:

(JSC::reflectObjectIsExtensible):
(JSC::reflectObjectSetPrototypeOf):

• runtime/SparseArrayValueMap.cpp:

(JSC::SparseArrayValueMap::putEntry):
(JSC::SparseArrayValueMap::putDirect):

• runtime/StringObject.cpp:

(JSC::StringObject::defineOwnProperty):

• runtime/Structure.cpp:

(JSC::Structure::isSealed):
(JSC::Structure::isFrozen):

• runtime/Structure.h:

File:

• trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp

@@ -197 +197 @@
         // FIXME: this doesn't work if 'target' is another Proxy. We don't have isExtensible implemented in a way that fits w/ Proxys.
         // https://bugs.webkit.org/show_bug.cgi?id=154375
-        if (!target->isExtensible()) {
+        bool isExtensible = target->isExtensibleInline(exec);
+        if (exec->hadException())
+            return false;
+        if (!isExtensible) {
             // FIXME: Come up with a test for this error. I'm not sure how to because
             // Object.seal(o) will make all fields [[Configurable]] false.
@@ -208 +211 @@
     }
 
+    bool isExtensible = target->isExtensibleInline(exec);
+    if (exec->hadException())
+        return false;
     PropertyDescriptor trapResultAsDescriptor;
     toPropertyDescriptor(exec, trapResult, trapResultAsDescriptor);
@@ -213 +219 @@
         return false;
     bool throwException = false;
-    bool valid = validateAndApplyPropertyDescriptor(exec, nullptr, propertyName, target->isExtensible(),
+    bool valid = validateAndApplyPropertyDescriptor(exec, nullptr, propertyName, isExtensible,
         trapResultAsDescriptor, isTargetPropertyDescriptorDefined, targetPropertyDescriptor, throwException);
     if (!valid) {
@@ -289 +295 @@
                 return false;
             }
-            if (!target->isExtensible()) {
+            bool isExtensible = target->isExtensibleInline(exec);
+            if (exec->hadException())
+                return false;
+            if (!isExtensible) {
                 throwVMTypeError(exec, ASCIILiteral("Proxy 'has' must return 'true' for a non-extensible 'target' object with a configurable property."));
                 return false;