Changeset 252216 in webkit

Timestamp:

Nov 7, 2019 4:37:52 PM (4 years ago)

Author:

Tadeu Zagallo

Message:

[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):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• debugger/DebuggerCallFrame.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-11-07  Tadeu Zagallo  <tzagallo@apple.com>
+
+        [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):
+
 2019-11-07  Devin Rousso  <drousso@apple.com>
 

trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp

@@ -321 +321 @@
         return noSourceID;
     CodeBlock* codeBlock = callFrame->codeBlock();
-    if (!codeBlock)
+    if (!codeBlock || callFrame->callee().isWasm())
         return noSourceID;
     return codeBlock->ownerExecutable()->sourceID();