Changeset 28608 in webkit for trunk/JavaScriptCore/kjs/ExecState.h

Timestamp:

Dec 10, 2007, 9:47:41 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

Reviewed by Sam Weinig.

Split this:

FunctionBodyNode

^|

ProgramNode

into this:

ScopeNode

^{| | |}

FunctionBodyNode ProgramNode EvalNode

in preparation for specializing each class more while optimizing global
variable access.

Also removed some cruft from the FunctionBodyNode interface to simplify
things.

SunSpider says this patch is a .8% speedup, which seems reasonable,
since it eliminates a few branches and adds KJS_FAST_CALL in a few
places.

Layout tests and JS tests pass. Also, this baby builds on Windows! (Qt
mileage may vary...)

WebCore:

Reviewed by Sam Weinig.

Updated for rename in JavaScriptCore.

• bridge/mac/WebCoreScriptDebugger.mm: (-[WebCoreScriptCallFrame scopeChain]): (-[WebCoreScriptCallFrame functionName]): (-[WebCoreScriptCallFrame evaluateWebScript:]):

WebKit/win:

Reviewed by Sam Weinig.

Updated for rename in JavaScriptCore.

• WebScriptCallFrame.cpp: (WebScriptCallFrame::functionName): (WebScriptCallFrame::valueByEvaluatingJavaScriptFromString):

File:

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

trunk/JavaScriptCore/kjs/ExecState.h

@@ -40 +40 @@
     
     class ActivationImp;
-    class FunctionBodyNode;
     class FunctionImp;
     class GlobalFuncImp;
@@ -47 +46 @@
     class JSVariableObject;
     class ScopeChain;
+    class ScopeNode;
     struct LocalStorageEntry;
     
@@ -85 +85 @@
         ActivationImp* activationObject() { return m_activation; }
         CodeType codeType() { return m_codeType; }
-        FunctionBodyNode* currentBody() { return m_currentBody; }
+        ScopeNode* scopeNode() { return m_scopeNode; }
         FunctionImp* function() const { return m_function; }
         const List* arguments() const { return m_arguments; }
@@ -112 +112 @@
     public:
         ExecState(JSGlobalObject* glob, JSObject* thisV,
-                  FunctionBodyNode* currentBody, CodeType type = GlobalCode,
+                  ScopeNode* scopeNode, CodeType type = GlobalCode,
                   ExecState* callingExecState = 0, ExecState* currentExec = 0, 
                   FunctionImp* function = 0, const List* args = 0);
@@ -127 +127 @@
         ExecState* m_callingExec;
         ExecState* m_savedExec;
-        FunctionBodyNode* m_currentBody;
+        ScopeNode* m_scopeNode;
         
         FunctionImp* m_function;