Changeset 209636 in webkit

Timestamp:

Dec 9, 2016 3:37:00 PM (7 years ago)

Author:

Chris Dumez

Message:

Inline JSCell::toObject()
​https://bugs.webkit.org/show_bug.cgi?id=165679

Reviewed by Geoffrey Garen.

Inline JSCell::toObject() as it shows on Speedometer profiles.

• runtime/JSCell.cpp:

(JSC::JSCell::toObjectSlow):
(JSC::JSCell::toObject): Deleted.

• runtime/JSCell.h:
• runtime/JSCellInlines.h:

(JSC::JSCell::toObject):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSCell.cpp (modified) (1 diff)
• runtime/JSCell.h (modified) (2 diffs)
• runtime/JSCellInlines.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-12-09  Chris Dumez  <cdumez@apple.com>
+
+        Inline JSCell::toObject()
+        https://bugs.webkit.org/show_bug.cgi?id=165679
+
+        Reviewed by Geoffrey Garen.
+
+        Inline JSCell::toObject() as it shows on Speedometer profiles.
+
+        * runtime/JSCell.cpp:
+        (JSC::JSCell::toObjectSlow):
+        (JSC::JSCell::toObject): Deleted.
+        * runtime/JSCell.h:
+        * runtime/JSCellInlines.h:
+        (JSC::JSCell::toObject):
+
 2016-12-09  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSCell.cpp

@@ -170 +170 @@
 }
 
-JSObject* JSCell::toObject(ExecState* exec, JSGlobalObject* globalObject) const
-{
+JSObject* JSCell::toObjectSlow(ExecState* exec, JSGlobalObject* globalObject) const
+{
+    ASSERT(!isObject());
     if (isString())
         return static_cast<const JSString*>(this)->toObject(exec, globalObject);
-    if (isSymbol())
-        return static_cast<const Symbol*>(this)->toObject(exec, globalObject);
-    ASSERT(isObject());
-    return jsCast<JSObject*>(const_cast<JSCell*>(this));
+    ASSERT(isSymbol());
+    return static_cast<const Symbol*>(this)->toObject(exec, globalObject);
 }
 

trunk/Source/JavaScriptCore/runtime/JSCell.h

@@ -145 +145 @@
     TriState pureToBoolean() const;
     JS_EXPORT_PRIVATE double toNumber(ExecState*) const;
-    JS_EXPORT_PRIVATE JSObject* toObject(ExecState*, JSGlobalObject*) const;
+    JSObject* toObject(ExecState*, JSGlobalObject*) const;
 
     void dump(PrintStream&) const;
@@ -251 +251 @@
     friend class LLIntOffsetsExtractor;
 
+    JS_EXPORT_PRIVATE JSObject* toObjectSlow(ExecState*, JSGlobalObject*) const;
+
     StructureID m_structureID;
     IndexingType m_indexingTypeAndMisc; // DO NOT store to this field. Always CAS.

trunk/Source/JavaScriptCore/runtime/JSCellInlines.h

@@ -337 +337 @@
 }
 
+inline JSObject* JSCell::toObject(ExecState* exec, JSGlobalObject* globalObject) const
+{
+    if (isObject())
+        return jsCast<JSObject*>(const_cast<JSCell*>(this));
+    return toObjectSlow(exec, globalObject);
+}
+
 } // namespace JSC