Changeset 34182 in webkit for trunk/JavaScriptCore

Timestamp:

May 28, 2008, 1:47:13 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-05-27 Geoffrey Garen <​[email protected]>

Reviewed by Tim Hatcher.

Fixed ​https://bugs.webkit.org/show_bug.cgi?id=19183
REGRESSION (r33979): Crash in DebuggerCallFrame::functionName when
clicking button in returnEvent-crash.html

Added two new debugger hooks, willExecuteProgram and didExecuteProgram,
along with code to generate them, code to invoke them when unwinding
due to an exception, and code to dump them.

SunSpider reports no change.

• VM/CodeBlock.cpp: (KJS::debugHookName): I had to mark this function NEVER_INLINE to avoid a .4% performance regression. The mind boggles.

WebCore:

2008-05-27 Geoffrey Garen <​[email protected]>

Reviewed by Tim Hatcher.

Fixed ​https://bugs.webkit.org/show_bug.cgi?id=19183
REGRESSION (r33979): Crash in DebuggerCallFrame::functionName when
clicking button in returnEvent-crash.html

Added implementations for willExecuteProgram and didExecuteProgram. They
take care to update our call frame when entering and exiting programs,
preventing us from keeping around a stale global frame after executing
a program.

eval programs now show up as "anonymous function" in a new scope. This
is slightly better than what they used to do -- overwriting the current
scope -- but obviously we can do better.

WebKit/mac:

2008-05-27 Geoffrey Garen <​[email protected]>

Reviewed by Tim Hatcher.

Fixed ​https://bugs.webkit.org/show_bug.cgi?id=19183
REGRESSION (r33979): Crash in DebuggerCallFrame::functionName when
clicking button in returnEvent-crash.html

Added implementations for willExecuteProgram and didExecuteProgram, which
take care of making sure we're not hanging on to stale data.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CodeBlock.cpp (modified) (1 diff)
• VM/Machine.cpp (modified) (3 diffs)
• VM/Machine.h (modified) (1 diff)
• kjs/debugger.h (modified) (1 diff)
• kjs/nodes.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-27  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Tim Hatcher.
+
+        Fixed https://bugs.webkit.org/show_bug.cgi?id=19183
+        REGRESSION (r33979): Crash in DebuggerCallFrame::functionName when
+        clicking button in returnEvent-crash.html
+
+        Added two new debugger hooks, willExecuteProgram and didExecuteProgram,
+        along with code to generate them, code to invoke them when unwinding
+        due to an exception, and code to dump them.
+        
+        SunSpider reports no change.
+
+        * VM/CodeBlock.cpp:
+        (KJS::debugHookName): I had to mark this function NEVER_INLINE to avoid
+        a .4% performance regression. The mind boggles.
+
 2008-05-28  Adam Roben  <[email protected]>
 

trunk/JavaScriptCore/VM/CodeBlock.cpp

@@ -96 +96 @@
 }
 
-static const char* debugHookName(int debugHookID)
-{
-    if (debugHookID == DidEnterCallFrame)
+NEVER_INLINE static const char* debugHookName(int debugHookID)
+{
+    switch((DebugHookID)debugHookID) {
+    case DidEnterCallFrame:
         return "didEnterCallFrame";
-    else if (debugHookID == WillLeaveCallFrame)
+    case WillLeaveCallFrame:
         return "willLeaveCallFrame";
-    else {
-        ASSERT(debugHookID == WillExecuteStatement);
+    case WillExecuteStatement:
         return "willExecuteStatement";
-    }
+    case WillExecuteProgram:
+        return "willExecuteProgram";
+    case DidExecuteProgram:
+        return "didExecuteProgram";
+    }
+    
+    ASSERT_NOT_REACHED();
+    return "";
 }
 

trunk/JavaScriptCore/VM/Machine.cpp

@@ -565 +565 @@
 {
     CodeBlock* oldCodeBlock = codeBlock;
-
+    Register* callFrame = r - oldCodeBlock->numLocals - CallFrameHeaderSize;
+    
     if (Debugger* debugger = exec->dynamicGlobalObject()->debugger()) {
-        if (!isGlobalCallFrame(registerBase, r)) {
-            DebuggerCallFrame debuggerCallFrame(this, exec->dynamicGlobalObject(), codeBlock, scopeChain, exceptionValue, registerBase, r - *registerBase);
+        DebuggerCallFrame debuggerCallFrame(this, exec->dynamicGlobalObject(), codeBlock, scopeChain, exceptionValue, registerBase, r - *registerBase);
+        if (!isGlobalCallFrame(registerBase, r) && callFrame[Callee].u.jsObject) // Check for global and eval code
             debugger->returnEvent(debuggerCallFrame, codeBlock->ownerNode->sourceId(), codeBlock->ownerNode->lastLine());
-        }
-    }
-
-    Register* callFrame = r - oldCodeBlock->numLocals - CallFrameHeaderSize;
-    
+        else
+            debugger->didExecuteProgram(debuggerCallFrame, codeBlock->ownerNode->sourceId(), codeBlock->ownerNode->lastLine());
+    }
+
     if (Profiler* profiler = *Profiler::enabledProfilerReference()) {
         if (!isGlobalCallFrame(registerBase, r) && callFrame[Callee].u.jsObject) // Check for global and eval code
@@ -850 +850 @@
     case WillExecuteStatement: {
         debugger->atStatement(debuggerCallFrame, codeBlock->ownerNode->sourceId(), firstLine);
+        return;
+    }
+    case WillExecuteProgram: {
+        debugger->willExecuteProgram(debuggerCallFrame, codeBlock->ownerNode->sourceId(), lastLine);
+        return;
+    }
+    case DidExecuteProgram: {
+        debugger->didExecuteProgram(debuggerCallFrame, codeBlock->ownerNode->sourceId(), firstLine);
         return;
     }
@@ -2352 +2360 @@
         /* debug debugHookID(n) firstLine(n) lastLine(n)
          
-         Notifies the debugger of the current state of execution:
-         didEnterCallFrame; willLeaveCallFrame; or willExecuteStatement.
-         
-         This opcode is only generated while the debugger is attached.
+         Notifies the debugger of the current state of execution. This opcode
+         is only generated while the debugger is attached.
         */
 

trunk/JavaScriptCore/VM/Machine.h

@@ -48 +48 @@
     
     enum DebugHookID {
-        WillExecuteStatement,
+        WillExecuteProgram,
+        DidExecuteProgram,
         DidEnterCallFrame,
-        WillLeaveCallFrame
+        WillLeaveCallFrame,
+        WillExecuteStatement
     };
 

trunk/JavaScriptCore/kjs/debugger.h

@@ -165 +165 @@
     virtual void returnEvent(const DebuggerCallFrame&, int sourceId, int lineno) = 0;
 
+    virtual void willExecuteProgram(const DebuggerCallFrame&, int sourceId, int lineno) = 0;
+    virtual void didExecuteProgram(const DebuggerCallFrame&, int sourceId, int lineno) = 0;
+
   private:
     HashSet<JSGlobalObject*> m_globalObjects;

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -5826 +5826 @@
 RegisterID* EvalNode::emitCode(CodeGenerator& generator, RegisterID*)
 {
+    generator.emitDebugHook(WillExecuteProgram, firstLine(), lastLine());
+
     RefPtr<RegisterID> dstRegister = generator.newTemporary();
     generator.emitLoad(dstRegister.get(), jsUndefined());
     statementListEmitCode(m_children, generator, dstRegister.get());
+
+    generator.emitDebugHook(DidExecuteProgram, firstLine(), lastLine());
     generator.emitEnd(dstRegister.get());
     return 0;
@@ -5902 +5906 @@
 RegisterID* ProgramNode::emitCode(CodeGenerator& generator, RegisterID*)
 {
+    generator.emitDebugHook(WillExecuteProgram, firstLine(), lastLine());
+
     RefPtr<RegisterID> dstRegister = generator.newTemporary();
     generator.emitLoad(dstRegister.get(), jsUndefined());
     statementListEmitCode(m_children, generator, dstRegister.get());
+
+    generator.emitDebugHook(DidExecuteProgram, firstLine(), lastLine());
     generator.emitEnd(dstRegister.get());
     return 0;