Changeset 29059 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Jan 1, 2008, 12:43:59 AM (17 years ago)

Author:

Darin Adler

Message:

Reviewed by Oliver.

• ​http://bugs.webkit.org/show_bug.cgi?id=16684 eliminate debugger overhead from function body execution

Speeds SunSpider up 1.003x. That's a small amount, but measurable.

• JavaScriptCore.exp: Updated.
• kjs/Parser.h: (KJS::Parser::parse): Create the node with a static member function named create() instead of using new explicitly.

• kjs/grammar.y: Changed calls to new FunctionBodyNode to use FunctionBodyNode::create().

• kjs/nodes.cpp: (KJS::ProgramNode::create): Added. Calls new. (KJS::EvalNode::create): Ditto. (KJS::FunctionBodyNode::create): Ditto, but creates FunctionBodyNodeWithDebuggerHooks when a debugger is present. (KJS::FunctionBodyNode::execute): Removed debugger hooks. (KJS::FunctionBodyNodeWithDebuggerHooks::FunctionBodyNodeWithDebuggerHooks): Added. (KJS::FunctionBodyNodeWithDebuggerHooks::execute): Calls the debugger, then the code, then the debugger again.

• kjs/nodes.h: Added create functions, made the constructors private and protected.

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -44 +44 @@
 
 namespace KJS {
+
+    class FunctionBodyNodeWithDebuggerHooks : public FunctionBodyNode {
+    public:
+        FunctionBodyNodeWithDebuggerHooks(SourceElements*, DeclarationStacks::VarStack*, DeclarationStacks::FunctionStack*) KJS_FAST_CALL;
+        virtual JSValue* execute(ExecState*) KJS_FAST_CALL;
+    };
 
 #define KJS_CHECKEXCEPTION \
@@ -4226 +4232 @@
 }
 
+ProgramNode* ProgramNode::create(SourceElements* children, DeclarationStacks::VarStack* varStack, DeclarationStacks::FunctionStack* funcStack)
+{
+    return new ProgramNode(children, varStack, funcStack);
+}
+
 EvalNode::EvalNode(SourceElements* children, DeclarationStacks::VarStack* varStack, DeclarationStacks::FunctionStack* funcStack)
     : ScopeNode(children, varStack, funcStack)
 {
+}
+
+EvalNode* EvalNode::create(SourceElements* children, DeclarationStacks::VarStack* varStack, DeclarationStacks::FunctionStack* funcStack)
+{
+    return new EvalNode(children, varStack, funcStack);
 }
 
@@ -4235 +4251 @@
     , m_initialized(false)
 {
+}
+
+FunctionBodyNode* FunctionBodyNode::create(SourceElements* children, DeclarationStacks::VarStack* varStack, DeclarationStacks::FunctionStack* funcStack)
+{
+    if (Debugger::debuggersPresent)
+        return new FunctionBodyNodeWithDebuggerHooks(children, varStack, funcStack);
+    return new FunctionBodyNode(children, varStack, funcStack);
 }
 
@@ -4475 +4498 @@
 {
     processDeclarations(exec);
-
+    return ScopeNode::execute(exec);
+}
+
+// ------------------------------ FunctionBodyNodeWithDebuggerHooks ---------------------------------
+
+FunctionBodyNodeWithDebuggerHooks::FunctionBodyNodeWithDebuggerHooks(SourceElements* children,
+        DeclarationStacks::VarStack* varStack, DeclarationStacks::FunctionStack* funcStack)
+    : FunctionBodyNode(children, varStack, funcStack)
+{
+}
+
+JSValue* FunctionBodyNodeWithDebuggerHooks::execute(ExecState* exec)
+{
     if (Debugger* dbg = exec->dynamicGlobalObject()->debugger()) {
         if (!dbg->callEvent(exec, sourceId(), lineNo(), exec->function(), *exec->arguments())) {
@@ -4481 +4516 @@
             return exec->setInterruptedCompletion();
         }
-    }    
-    
-    JSValue* result = ScopeNode::execute(exec);
-    
+    }
+
+    JSValue* result = FunctionBodyNode::execute(exec);
+
     if (Debugger* dbg = exec->dynamicGlobalObject()->debugger()) {
         if (exec->completionType() == Throw)
@@ -4494 +4529 @@
     }
 
-    
     return result;
 }