Changeset 239753 in webkit for trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp

Timestamp:

Jan 8, 2019, 4:39:45 PM (6 years ago)

Author:

[email protected]

Message:

ASSERT when paused in debugger and console evaluation causes exception
​https://bugs.webkit.org/show_bug.cgi?id=193246

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2019-01-08
Reviewed by Mark Lam.

Source/JavaScriptCore:

• runtime/VM.cpp:

(JSC::VM::throwException):
Improve assertion to allow for the debugger's evaluate on call frame condition.

• runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::callFrameAtDebuggerEntry const):
(JSC::JSGlobalObject::setCallFrameAtDebuggerEntry):
Debugger call frame only used by assertions.

• debugger/DebuggerCallFrame.cpp:

(JSC::DebuggerCallFrame::evaluateWithScopeExtension):

• debugger/DebuggerEvalEnabler.h:

(JSC::DebuggerEvalEnabler::DebuggerEvalEnabler):
(JSC::DebuggerEvalEnabler::~DebuggerEvalEnabler):
When evaluating on a call frame, set a debug GlobalObject state.

LayoutTests:

• inspector/debugger/evaluateOnCallFrame-CommandLineAPI.html:

Correct a typo.

• inspector/debugger/evaluateOnCallFrame-exception-expected.txt: Added.
• inspector/debugger/evaluateOnCallFrame-exception.html: Added.

New test that would have asserted before.

File:

• trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp

@@ -233 +233 @@
         return jsUndefined();
     
-    DebuggerEvalEnabler evalEnabler(callFrame);
+    DebuggerEvalEnabler evalEnabler(callFrame, DebuggerEvalEnabler::Mode::EvalOnCallFrameAtDebuggerEntry);
 
     EvalContextType evalContextType;