Changeset 29425 in webkit for trunk/JavaScriptCore/kjs/function.h

Timestamp:

Jan 11, 2008, 6:08:50 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

Reviewed by Maciej.

Optimized ActivationImp allocation, so that activation records are now
first allocated on an explicitly managed stack and only heap allocated
when necessary. Roughly a 5% improvement on SunSpider, and a larger
improvement on benchmarks that use more function calls.

• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/Activation.h: Added. (KJS::ActivationImp::ActivationData::ActivationData): (KJS::ActivationImp::ActivationImp): (KJS::ActivationImp::classInfo): (KJS::ActivationImp::isActivationObject): (KJS::ActivationImp::isOnStack): (KJS::ActivationImp::d): (KJS::StackActivation::StackActivation):
• kjs/ExecState.cpp: (KJS::ExecState::ExecState): (KJS::ExecState::~ExecState):
• kjs/ExecState.h: (KJS::ExecState::replaceScopeChainTop): (KJS::ExecState::setActivationObject): (KJS::ExecState::setLocalStorage):
• kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::reset): (KJS::JSGlobalObject::pushActivation): (KJS::JSGlobalObject::checkActivationCount): (KJS::JSGlobalObject::popActivationHelper): (KJS::JSGlobalObject::popActivation): (KJS::JSGlobalObject::tearOffActivation):
• kjs/JSGlobalObject.h:
• kjs/JSVariableObject.h: (KJS::JSVariableObject::JSVariableObjectData::JSVariableObjectData): (KJS::JSVariableObject::JSVariableObject):
• kjs/function.cpp: (KJS::FunctionImp::argumentsGetter): (KJS::ActivationImp::ActivationImp): (KJS::ActivationImp::~ActivationImp): (KJS::ActivationImp::init): (KJS::ActivationImp::getOwnPropertySlot): (KJS::ActivationImp::markHelper): (KJS::ActivationImp::mark): (KJS::ActivationImp::ActivationData::ActivationData): (KJS::GlobalFuncImp::callAsFunction):
• kjs/function.h:
• kjs/nodes.cpp: (KJS::PostIncResolveNode::evaluate): (KJS::PostDecResolveNode::evaluate): (KJS::PreIncResolveNode::evaluate): (KJS::PreDecResolveNode::evaluate): (KJS::ReadModifyResolveNode::evaluate): (KJS::AssignResolveNode::evaluate): (KJS::WithNode::execute): (KJS::TryNode::execute): (KJS::FunctionBodyNode::processDeclarations): (KJS::FuncExprNode::evaluate):
• kjs/object.h:
• kjs/scope_chain.h: (KJS::ScopeChain::replace):
• kjs/scope_chain_mark.h: Added. (KJS::ScopeChain::mark):

WebCore:

Reviewed by Maciej.

Added a new forwarding header, because Activation.h has been separated
from function.h

• ForwardingHeaders/kjs/Activation.h: Added.

LayoutTests:

Reviewed by Maciej.

Added a test case that came up when developing the ActivationImp tear-off.

• fast/js/resources/vardecl-preserve-arguments.js:
• fast/js/vardecl-preserve-arguments-expected.txt:

File:

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

trunk/JavaScriptCore/kjs/function.h

@@ -37 +37 @@
   class FunctionBodyNode;
   class FunctionPrototype;
+  class JSGlobalObject;
 
   class InternalFunctionImp : public JSObject {
@@ -138 +139 @@
   };
 
-  class ActivationImp : public JSVariableObject {
-  private:
-    using JSVariableObject::JSVariableObjectData;
-
-    struct ActivationImpData : public JSVariableObjectData {
-        ActivationImpData(ExecState* e)
-            : JSVariableObjectData(&e->function()->body->symbolTable())
-            , exec(e)
-            , function(e->function()) // Store this pointer for marking, to keep our symbol table / scope alive after exec has gone out of scope.
-            , argumentsObject(0)
-        {
-        }
-
-        ExecState* exec;
-        FunctionImp* function;
-        Arguments* argumentsObject;
-    };
-
-  public:
-    ActivationImp(ExecState* exec)
-        : JSVariableObject(new ActivationImpData(exec))
-    {
-    }
-
-    virtual ~ActivationImp()
-    {
-        delete d();
-    }
-
-    virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
-    virtual void put(ExecState*, const Identifier& propertyName, JSValue* value, int attr = None);
-    virtual bool deleteProperty(ExecState*, const Identifier& propertyName);
-
-    virtual const ClassInfo* classInfo() const { return &info; }
-    static const ClassInfo info;
-
-    virtual void mark();
-
-    virtual bool isActivationObject() { return true; }
-
-  private:
-    static PropertySlot::GetValueFunc getArgumentsGetter();
-    static JSValue* argumentsGetter(ExecState*, JSObject*, const Identifier&, const PropertySlot& slot);
-    void createArgumentsObject(ExecState*);
-    ActivationImpData* d() { return static_cast<ActivationImpData*>(JSVariableObject::d); }
-  };
-
   class GlobalFuncImp : public InternalFunctionImp {
   public: