commit 9fd9b240827bf3c1a18fd48ee7ffeba6f3433c47
author tzagallo@apple.com <tzagallo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Nov 08 00:37:52 2019 +0000
committer tzagallo@apple.com <tzagallo@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Fri Nov 08 00:37:52 2019 +0000
tree 9175d3ca2db13072e65a61a766b3ce909ceba1ee
parent 477821c8212b61d54d37060d005c3d4d5e9e10c9

[WebAssembly] Inspector's DebuggerCallFrame should be aware of Wasm frames
https://bugs.webkit.org/show_bug.cgi?id=203925

Reviewed by Mark Lam.

The DebuggerCallFrame checks for CallFrame::codeBlock to determine if it the current frame is a
valid JS frame, but since the Wasm interpreter stores the Wasm::FunctionCodeBlock to this slot,
that check is not sufficient. Add an extra check for CalleeBits::isWasm.

* debugger/DebuggerCallFrame.cpp:
(JSC::DebuggerCallFrame::sourceIDForCallFrame):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@252216 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp

diff --git a/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp b/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp
index 015d19e..3258faa 100644
--- a/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp
+++ b/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp
@@ -320,7 +320,7 @@
     if (!callFrame)
         return noSourceID;
     CodeBlock* codeBlock = callFrame->codeBlock();
-    if (!codeBlock)
+    if (!codeBlock || callFrame->callee().isWasm())
         return noSourceID;
     return codeBlock->ownerExecutable()->sourceID();
 }