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

Timestamp:

Dec 5, 2007, 2:48:48 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff.

• Wait until local variable data is fully constructed before notifying the debugger of entering or leaving a call frame.

• kjs/function.cpp: (KJS::FunctionImp::callAsFunction):
• kjs/nodes.cpp: (KJS::FunctionBodyNode::execute):

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -4580 +4580 @@
 {
     processDeclarations(exec);
-    return BlockNode::execute(exec);
+
+    if (Debugger* dbg = exec->dynamicInterpreter()->debugger()) {
+        if (!dbg->callEvent(exec, sourceId(), lineNo(), exec->function(), *exec->arguments())) {
+            dbg->imp()->abort();
+            return Completion(Interrupted, jsUndefined());
+        }
+    }    
+    
+    Completion completion = BlockNode::execute(exec);
+    
+    if (Debugger* dbg = exec->dynamicInterpreter()->debugger()) {
+        if (completion.complType() == Throw)
+            exec->setException(completion.value());
+
+        if (!dbg->returnEvent(exec, sourceId(), lineNo(), exec->function())) {
+            dbg->imp()->abort();
+            return Completion(Interrupted, jsUndefined());
+        }
+    }
+
+    
+    return completion;
 }