Changeset 37333 in webkit for trunk/JavaScriptCore/kjs/JSObject.h

Timestamp:

Oct 6, 2008, 10:50:08 AM (17 years ago)

Author:

[email protected]

Message:

2008-10-06 Maciej Stachowiak <​[email protected]>

Reviewed by Sam Weinig.

• optimize op_jtrue, op_loop_if_true and op_not in various ways ​https://bugs.webkit.org/show_bug.cgi?id=21404

1) Make JSValue::toBoolean nonvirtual and completely inline by
making use of the StructureID type field.

2) Make JSValue::toBoolean not take an ExecState; doesn't need it.

3) Make op_not, op_loop_if_true and op_jtrue not read the
ExecState (toBoolean doesn't need it any more) and not check
exceptions (toBoolean can't throw).

• API/JSValueRef.cpp: (JSValueToBoolean):
• JavaScriptCore.exp:
• VM/CodeBlock.cpp: (JSC::CodeBlock::dump):
• VM/Machine.cpp: (JSC::Machine::privateExecute): (JSC::Machine::cti_op_loop_if_true): (JSC::Machine::cti_op_not): (JSC::Machine::cti_op_jtrue):
• kjs/ArrayPrototype.cpp: (JSC::arrayProtoFuncFilter): (JSC::arrayProtoFuncEvery): (JSC::arrayProtoFuncSome):
• kjs/BooleanConstructor.cpp: (JSC::constructBoolean): (JSC::callBooleanConstructor):
• kjs/GetterSetter.h:
• kjs/JSCell.h: (JSC::JSValue::toBoolean):
• kjs/JSNumberCell.cpp:
• kjs/JSNumberCell.h: (JSC::JSNumberCell::toBoolean):
• kjs/JSObject.cpp:
• kjs/JSObject.h: (JSC::JSObject::toBoolean): (JSC::JSCell::toBoolean):
• kjs/JSString.cpp:
• kjs/JSString.h: (JSC::JSString::toBoolean):
• kjs/JSValue.h:
• kjs/RegExpConstructor.cpp: (JSC::setRegExpConstructorMultiline):
• kjs/RegExpObject.cpp: (JSC::RegExpObject::match):
• kjs/RegExpPrototype.cpp: (JSC::regExpProtoFuncToString):

File:

• trunk/JavaScriptCore/kjs/JSObject.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/JSObject.h

@@ -29 +29 @@
 #include "ExecState.h"
 #include "JSNumberCell.h"
+#include "JSString.h"
 #include "PropertyMap.h"
 #include "PropertySlot.h"
@@ -110 +111 @@
         virtual JSValue* toPrimitive(ExecState*, PreferredPrimitiveType = NoPreference) const;
         virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue*& value);
-        virtual bool toBoolean(ExecState*) const;
+        bool toBoolean() const { return true; }
         virtual double toNumber(ExecState*) const;
         virtual UString toString(ExecState*) const;
@@ -245 +246 @@
     }
     return false;
+}
+
+inline bool JSCell::toBoolean() const
+{
+    JSType type = structureID()->typeInfo().type();
+    if (type == NumberType)
+        return static_cast<const JSNumberCell*>(this)->toBoolean();
+    if (type == ObjectType)
+        return static_cast<const JSObject*>(this)->toBoolean();
+    ASSERT(type == StringType);
+    return static_cast<const JSString*>(this)->toBoolean();
 }