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

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.

File:

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

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;