Changeset 15846 in webkit for trunk/JavaScriptCore/kjs/object.h

Timestamp:

Aug 13, 2006, 8:06:14 PM (19 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed (and tweaked a little) by Maciej.

• shrank the size of JSObject by 8 bytes and made the corresponding reduction to the cell size, resulting in a 1.2% speed improvement on JS iBench (and probably overall memory savings).

This was done by removing _scope and _internalValue data members
from JSObject and moving them only to the subclasses that actually
make use of them.

• kjs/object.cpp: (KJS::JSObject::mark): No need to mark scope or internal value here.
• kjs/object.h: (KJS::JSObject::JSObject): Don't initialize them.
• kjs/JSWrapperObject.cpp: Added. New base class for object types that wrap primitive values (Number, String, Boolean, Date). (KJS::JSWrapperObject::mark):
• kjs/JSWrapperObject.h: Added. (KJS::JSWrapperObject::JSWrapperObject): (KJS::JSWrapperObject::internalValue): (KJS::JSWrapperObject::setInternalValue):
• kjs/array_object.cpp: (ArrayPrototype::ArrayPrototype): Don't set useless internal value.
• kjs/bool_object.cpp: (BooleanInstance::BooleanInstance): Inherit from JSWrapperObject. (BooleanProtoFunc::callAsFunction): Fixed to account for fact that not all JSObjects have an internal value. (BooleanObjectImp::construct): ditto.
• kjs/bool_object.h:
• kjs/collector.cpp: Lowered cell size to 48. (KJS::Collector::allocate): meaningless whitespace change
• kjs/date_object.cpp: (KJS::DateInstance::DateInstance): Inherit from JSWrapperObject. (KJS::DateProtoFunc::callAsFunction): adjusted for move of internalValue (KJS::DateObjectImp::construct): ditto
• kjs/date_object.h:
• kjs/error_object.cpp: (ErrorPrototype::ErrorPrototype): don't set internal value
• kjs/function.cpp: move _scope and related handling here (KJS::FunctionImp::mark): mark scope
• kjs/function.h: (KJS::FunctionImp::scope): moved here from JSObject (KJS::FunctionImp::setScope): ditto
• kjs/number_object.cpp: (NumberInstance::NumberInstance): inherit from JSWrapperObject (NumberProtoFunc::callAsFunction): adjusted (NumberObjectImp::construct): adjusted
• kjs/number_object.h: shring RegExp-related objects a little
• kjs/regexp_object.cpp: (RegExpPrototype::RegExpPrototype): Adjust for size tweaks (RegExpObjectImp::RegExpObjectImp): ditto
• kjs/regexp_object.h:
• kjs/string_object.cpp: (StringInstance::StringInstance): inherit from JSWrapperObject (StringProtoFunc::callAsFunction): adjusted
• kjs/string_object.h:
• JavaScriptCore.exp: Exported new methods as needed.
• JavaScriptCore.xcodeproj/project.pbxproj: Added new files to build.

WebCore:

Reviewed (and tweaked a little) by Maciej.

• shrank the size of JSObject by 8 bytes and made the corresponding reduction to the cell size, resulting in a 1.2% speed improvement on JS iBench (and probably overall memory savings).

The WebCore part of this is to expect only FunctionImp to have a scope, not all JSObjects.

• bindings/js/kjs_events.cpp: (KJS::JSLazyEventListener::parseCode):

File:

• trunk/JavaScriptCore/kjs/object.h (modified) (5 diffs)

trunk/JavaScriptCore/kjs/object.h

@@ -413 +413 @@
     virtual bool hasInstance(ExecState *exec, JSValue *value);
 
-    /**
-     * Returns the scope of this object. This is used when execution declared
-     * functions - the execution context for the function is initialized with
-     * extra object in it's scope. An example of this is functions declared
-     * inside other functions:
-     *
-     * \code
-     * function f() {
-     *
-     *   function b() {
-     *     return prototype;
-     *   }
-     *
-     *   var x = 4;
-     *   // do some stuff
-     * }
-     * f.prototype = new String();
-     * \endcode
-     *
-     * When the function f.b is executed, its scope will include properties of
-     * f. So in the example above the return value of f.b() would be the new
-     * String object that was assigned to f.prototype.
-     *
-     * @param exec The current execution state
-     * @return The function's scope
-     */
-    const ScopeChain &scope() const { return _scope; }
-    void setScope(const ScopeChain &s) { _scope = s; }
-
     virtual void getPropertyNames(ExecState*, PropertyNameArray&);
-
-    /**
-     * Returns the internal value of the object. This is used for objects such
-     * as String and Boolean which are wrappers for native types. The interal
-     * value is the actual value represented by the wrapper objects.
-     *
-     * @see ECMA 8.6.2
-     * @return The internal value of the object
-     */
-    JSValue *internalValue() const;
-
-    /**
-     * Sets the internal value of the object
-     *
-     * @see internalValue()
-     *
-     * @param v The new internal value
-     */
-    void setInternalValue(JSValue *v);
 
     virtual JSValue *toPrimitive(ExecState *exec, JSType preferredType = UnspecifiedType) const;
@@ -508 +460 @@
     const HashEntry* findPropertyHashEntry( const Identifier& propertyName ) const;
     JSValue *_proto;
-    JSValue *_internalValue;
-    ScopeChain _scope;
   };
 
@@ -556 +506 @@
     : JSCell(destructorIsThreadSafe)
     , _proto(proto)
-    , _internalValue(0)
 {
     assert(proto);
@@ -564 +513 @@
     : JSCell(destructorIsThreadSafe)
     , _proto(jsNull())
-    , _internalValue(0)
-{
-}
-
-inline JSValue *JSObject::internalValue() const
-{
-    return _internalValue;
-}
-
-inline void JSObject::setInternalValue(JSValue *v)
-{
-    _internalValue = v;
+{
 }
 
@@ -647 +585 @@
     return false;
 }
+
 
 // FIXME: Put this function in a separate file named something like scope_chain_mark.h -- can't put it in scope_chain.h since it depends on JSObject.