Changeset 36743 in webkit for trunk/JavaScriptCore/kjs/Arguments.h

Timestamp:

Sep 21, 2008, 2:35:23 PM (17 years ago)

Author:

Darin Adler

Message:

2008-09-21 Darin Adler <Darin Adler>

Reviewed by Sam Weinig.

• ​https://bugs.webkit.org/show_bug.cgi?id=20972 speed up Arguments further by eliminating the IndexToNameMap

No change on SunSpider. 1.29x as fast on V8 Raytrace.

• kjs/Arguments.cpp: Moved ArgumentsData in here. Eliminated the indexToNameMap and hadDeletes data members. Changed extraArguments into an OwnArrayPtr and added deletedArguments, another OwnArrayPtr. Replaced numExtraArguments with numParameters, since that's what's used more directly in hot code paths. (JSC::Arguments::Arguments): Pass in argument count instead of ArgList. Initialize ArgumentsData the new way. (JSC::Arguments::mark): Updated. (JSC::Arguments::getOwnPropertySlot): Overload for the integer form so we don't have to convert integers to identifiers just to get an argument. Integrated the deleted case with the fast case. (JSC::Arguments::put): Ditto. (JSC::Arguments::deleteProperty): Ditto.

• kjs/Arguments.h: Minimized includes. Made everything private. Added overloads for the integral property name case. Eliminated mappedIndexSetter. Moved ArgumentsData into the .cpp file.

• kjs/IndexToNameMap.cpp: Emptied out and prepared for deletion.
• kjs/IndexToNameMap.h: Ditto.

• kjs/JSActivation.cpp: (JSC::JSActivation::createArgumentsObject): Elminated ArgList.

• GNUmakefile.am:
• JavaScriptCore.pri:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• JavaScriptCoreSources.bkl:
• kjs/AllInOneFile.cpp: Removed IndexToNameMap.

File:

• trunk/JavaScriptCore/kjs/Arguments.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/Arguments.h

@@ -25 +25 @@
 #define Arguments_h
 
-#include "IndexToNameMap.h"
-#include "JSFunction.h"
 #include "JSObject.h"
 
@@ -32 +30 @@
 
     class JSActivation;
+    class JSFunction;
     class Register;
+
+    struct ArgumentsData;
 
     class Arguments : public JSObject {
     public:
-        Arguments(ExecState*, JSFunction*, const ArgList&, JSActivation*, int firstArgumentIndex, Register* argv);
-        ~Arguments();
+        Arguments(ExecState*, JSFunction*, JSActivation*, int firstArgumentIndex, Register* argv, int argc);
+        virtual ~Arguments();
+
+        static const ClassInfo info;
 
         virtual void mark();
 
-        virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
+    private:
+        virtual bool getOwnPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&);
+        virtual bool getOwnPropertySlot(ExecState*, unsigned propertyName, PropertySlot&);
         virtual void put(ExecState*, const Identifier& propertyName, JSValue*, PutPropertySlot&);
+        virtual void put(ExecState*, unsigned propertyName, JSValue*, PutPropertySlot&);
         virtual bool deleteProperty(ExecState*, const Identifier& propertyName);
+        virtual bool deleteProperty(ExecState*, unsigned propertyName);
 
         virtual const ClassInfo* classInfo() const { return &info; }
-        static const ClassInfo info;
 
-    private:
-        static JSValue* mappedIndexGetter(ExecState*, const Identifier&, const PropertySlot& slot);
-
-        struct ArgumentsData {
-            ArgumentsData(JSActivation* activation_, JSFunction* function_, const ArgList& args_, int firstArgumentIndex_)
-                : activation(activation_)
-                , indexToNameMap(function_, args_)
-                , firstArgumentIndex(firstArgumentIndex_)
-                , hadDeletes(false)
-            {
-                unsigned numArguments = args_.size();
-                unsigned numParameters = function_->numParameters();
-                if (numArguments <= numParameters)
-                    numExtraArguments = 0;
-                else
-                    numExtraArguments = numArguments - numParameters;
-            }
-
-            JSActivation* activation;
-            mutable IndexToNameMap indexToNameMap;
-            int firstArgumentIndex;
-            JSValue** extraArguments;
-            unsigned numExtraArguments;
-            bool hadDeletes;
-        };
-        
         OwnPtr<ArgumentsData> d;
     };