Changeset 180660 in webkit

Timestamp:

Feb 25, 2015 10:05:02 PM (9 years ago)

Author:

msaboff@apple.com

Message:

Web Inspector: CRASH when debugger pauses inside a Promise handler
​https://bugs.webkit.org/show_bug.cgi?id=141396

Reviewed by Mark Lam.

Source/JavaScriptCore:

For frames that don't have a scope, typically native frames, use the lexicalGlobalObject to
create the DebuggerScope for that frame.

• debugger/DebuggerCallFrame.cpp:

(JSC::DebuggerCallFrame::scope):

LayoutTests:

New test.

• inspector/debugger/breakpoint-scope-expected.txt: Added.
• inspector/debugger/breakpoint-scope.html: Added.
• inspector/debugger/resources/scope.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/inspector/debugger/breakpoint-scope-expected.txt (added)
• LayoutTests/inspector/debugger/breakpoint-scope.html (added)
• LayoutTests/inspector/debugger/resources/scope.js (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-02-25  Michael Saboff  <msaboff@apple.com>
+
+        Web Inspector: CRASH when debugger pauses inside a Promise handler
+        https://bugs.webkit.org/show_bug.cgi?id=141396
+
+        Reviewed by Mark Lam.
+
+        New test.
+
+        * inspector/debugger/breakpoint-scope-expected.txt: Added.
+        * inspector/debugger/breakpoint-scope.html: Added.
+        * inspector/debugger/resources/scope.js: Added.
+
 2015-02-25  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-02-25  Michael Saboff  <msaboff@apple.com>
+
+        Web Inspector: CRASH when debugger pauses inside a Promise handler
+        https://bugs.webkit.org/show_bug.cgi?id=141396
+
+        Reviewed by Mark Lam.
+
+        For frames that don't have a scope, typically native frames, use the lexicalGlobalObject to
+        create the DebuggerScope for that frame.
+
+        * debugger/DebuggerCallFrame.cpp:
+        (JSC::DebuggerCallFrame::scope):
+
 2015-02-25  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp

@@ -148 +148 @@
         if (codeBlock && codeBlock->scopeRegister().isValid())
             scope = m_callFrame->scope(codeBlock->scopeRegister().offset());
+        else if (JSCallee* callee = jsDynamicCast<JSCallee*>(m_callFrame->callee()))
+            scope = callee->scope();
         else
-            scope = jsCast<JSCallee*>(m_callFrame->callee())->scope();
+            scope = m_callFrame->lexicalGlobalObject();
 
         m_scope.set(vm, DebuggerScope::create(vm, scope));