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

Timestamp:

Mar 2, 2016, 6:04:49 PM (9 years ago)

Author:

[email protected]

Message:

clean up JSObject::isExtensibleInline and JSObject::setPrototypeOfInline, and rename setPrototypeOf to setPrototype
​https://bugs.webkit.org/show_bug.cgi?id=154942

Reviewed by Benjamin Poulain.

These don't need to be inlined in the way they are.
Doing dynamic dispatch is ok performance wise until
we have evidence stating otherwise.

• API/JSObjectRef.cpp:

(JSObjectSetPrototype):
(JSObjectHasProperty):

• 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::setPrototype):
(JSC::JSCell::setPrototypeOf): Deleted.

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

(JSC::globalFuncProtoSetter):

• runtime/JSObject.cpp:

(JSC::JSObject::setPrototypeWithCycleCheck):
(JSC::JSObject::setPrototype):
(JSC::JSObject::allowsAccessFrom):
(JSC::JSObject::isExtensible):
(JSC::JSObject::reifyAllStaticProperties):
(JSC::JSObject::defineOwnNonIndexProperty):
(JSC::JSObject::setPrototypeOf): Deleted.

• runtime/JSObject.h:

(JSC::JSObject::mayInterceptIndexedAccesses):
(JSC::JSObject::indexingShouldBeSparse):
(JSC::JSObject::setPrototypeOfInline): Deleted.
(JSC::JSObject::isExtensibleInline): Deleted.

• runtime/ObjectConstructor.cpp:

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

• runtime/ProxyObject.cpp:

(JSC::ProxyObject::performInternalMethodGetOwnProperty):
(JSC::ProxyObject::performHasProperty):
(JSC::ProxyObject::performPreventExtensions):
(JSC::ProxyObject::performIsExtensible):

• runtime/ReflectObject.cpp:

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

• runtime/StringObject.cpp:

(JSC::StringObject::defineOwnProperty):

File:

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

trunk/Source/JavaScriptCore/runtime/JSObject.cpp

@@ -1212 +1212 @@
 }
 
-bool JSObject::setPrototypeOf(JSObject* object, ExecState* exec, JSValue prototype)
+bool JSObject::setPrototype(JSObject* object, ExecState* exec, JSValue prototype)
 {
     return object->setPrototypeWithCycleCheck(exec->vm(), exec, prototype);
+}
+
+bool JSObject::setPrototype(VM& vm, ExecState* exec, JSValue prototype)
+{
+    return methodTable(vm)->setPrototype(this, exec, prototype);
 }
 
@@ -1700 +1705 @@
 {
     return obj->isExtensibleImpl();
+}
+
+bool JSObject::isExtensible(ExecState* exec)
+{ 
+    VM& vm = exec->vm();
+    return methodTable(vm)->isExtensible(this, exec);
 }
 
@@ -2864 +2875 @@
     PropertyDescriptor current;
     bool isCurrentDefined = getOwnPropertyDescriptor(exec, propertyName, current);
-    bool isExtensible = isExtensibleInline(exec);
+    bool isExtensible = this->isExtensible(exec);
     if (UNLIKELY(exec->hadException()))
         return false;