Changeset 197467 in webkit for trunk/Source/JavaScriptCore/runtime/JSObject.cpp

Timestamp:

Mar 2, 2016, 2:39:02 PM (9 years ago)

Author:

[email protected]

Message:

SetPrototypeOf should be a fully virtual method in ClassInfo::methodTable
​https://bugs.webkit.org/show_bug.cgi?id=154897

Reviewed by Filip Pizlo.

This patch makes us more consistent with how the ES6 specification models the
SetPrototypeOf trap. Moving this method into ClassInfo::methodTable
is a prerequisite for implementing Proxy.SetPrototypeOf. This patch
still allows directly setting the prototype for situations where this
is the desired behavior. This is equivalent to setting the internal
Prototype field as described in the specification.

• API/JSClassRef.cpp:

(OpaqueJSClass::prototype):

• API/JSObjectRef.cpp:

(JSObjectMake):
(JSObjectSetPrototype):
(JSObjectHasProperty):

• API/JSWrapperMap.mm:

(makeWrapper):

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

(JSC::constructIntlCollator):

• runtime/IntlDateTimeFormatConstructor.cpp:

(JSC::constructIntlDateTimeFormat):

• runtime/IntlNumberFormatConstructor.cpp:

(JSC::constructIntlNumberFormat):

• runtime/JSCell.cpp:

(JSC::JSCell::isExtensible):
(JSC::JSCell::setPrototypeOf):

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

(JSC::JSGlobalObject::resetPrototype):

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::globalFuncProtoSetter):

• runtime/JSObject.cpp:

(JSC::JSObject::switchToSlowPutArrayStorage):
(JSC::JSObject::setPrototypeDirect):
(JSC::JSObject::setPrototypeWithCycleCheck):
(JSC::JSObject::setPrototypeOf):
(JSC::JSObject::allowsAccessFrom):
(JSC::JSObject::setPrototype): Deleted.

• runtime/JSObject.h:

(JSC::JSObject::setPrototypeOfInline):
(JSC::JSObject::mayInterceptIndexedAccesses):

• runtime/JSProxy.cpp:

(JSC::JSProxy::setTarget):

• runtime/ObjectConstructor.cpp:

(JSC::objectConstructorSetPrototypeOf):

• runtime/ReflectObject.cpp:

(JSC::reflectObjectSetPrototypeOf):

File:

• trunk/Source/JavaScriptCore/runtime/JSObject.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -1172 +1172 @@
 }
 
-void JSObject::setPrototype(VM& vm, JSValue prototype)
+void JSObject::setPrototypeDirect(VM& vm, JSValue prototype)
 {
     ASSERT(prototype);
@@ -1198 +1198 @@
 }
 
-bool JSObject::setPrototypeWithCycleCheck(ExecState* exec, JSValue prototype)
-{
-    ASSERT(methodTable(exec->vm())->toThis(this, exec, NotStrictMode) == this);
+bool JSObject::setPrototypeWithCycleCheck(VM& vm, ExecState* exec, JSValue prototype)
+{
+    UNUSED_PARAM(exec);
+    ASSERT(methodTable(vm)->toThis(this, exec, NotStrictMode) == this);
     JSValue nextPrototype = prototype;
     while (nextPrototype && nextPrototype.isObject()) {
@@ -1207 +1208 @@
         nextPrototype = asObject(nextPrototype)->prototype();
     }
-    setPrototype(exec->vm(), prototype);
+    setPrototypeDirect(vm, prototype);
     return true;
+}
+
+bool JSObject::setPrototypeOf(JSObject* object, ExecState* exec, JSValue prototype)
+{
+    return object->setPrototypeWithCycleCheck(exec->vm(), exec, prototype);
 }