Changeset 215854 in webkit for trunk/Source/JavaScriptCore/interpreter

Timestamp:

Apr 26, 2017, 8:38:12 PM (8 years ago)

Author:

[email protected]

Message:

Print Wasm function index in stack trace
​https://bugs.webkit.org/show_bug.cgi?id=171349

Reviewed by JF Bastien.

JSTests:

• wasm/function-tests/stack-trace.js: Added.

(import.Builder.from.string_appeared_here.assert):
(let.imp):

• wasm/function-tests/trap-after-cross-instance-call.js:

(wasmFrameCountFromError):

• wasm/function-tests/trap-load-2.js:

(wasmFrameCountFromError):

• wasm/function-tests/trap-load.js:

(wasmFrameCountFromError):

Source/JavaScriptCore:

This patch prints a Callee's index in the function index
space in Error.stack.

This will lead to stack traces that have lines of text like:
wasm function index: 4@[wasm code]

We don't ascribe indices to everything in wasm. Specifically, the
Wasm->JS call stub callee does not get a name, and neither does
the JS -> Wasm entrypoint.

• interpreter/Interpreter.cpp:

(JSC::GetStackTraceFunctor::operator()):

• interpreter/StackVisitor.cpp:

(JSC::StackVisitor::readNonInlinedFrame):
(JSC::StackVisitor::Frame::functionName):

• interpreter/StackVisitor.h:

(JSC::StackVisitor::Frame::wasmFunctionIndex):

• runtime/StackFrame.cpp:

(JSC::StackFrame::functionName):

• runtime/StackFrame.h:

(JSC::StackFrame::StackFrame):
(JSC::StackFrame::wasm):
(JSC::StackFrame::hasBytecodeOffset):
(JSC::StackFrame::bytecodeOffset):

• wasm/WasmBBQPlanInlines.h:

(JSC::Wasm::BBQPlan::initializeCallees):

• wasm/WasmCallee.cpp:

(JSC::Wasm::Callee::Callee):

• wasm/WasmCallee.h:

(JSC::Wasm::Callee::create):
(JSC::Wasm::Callee::index):

• wasm/WasmOMGPlan.cpp:

(JSC::Wasm::OMGPlan::work):

Location:

trunk/Source/JavaScriptCore/interpreter

Files:

• Interpreter.cpp (modified) (1 diff)
• StackVisitor.cpp (modified) (2 diffs)
• StackVisitor.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -480 +480 @@
 
         if (m_remainingCapacityForFrameCapture) {
-            if (visitor->isWasmFrame())
-                m_results.append(StackFrame::wasm());
-            else if (!!visitor->codeBlock() && !visitor->codeBlock()->unlinkedCodeBlock()->isBuiltinFunction()) {
+            if (visitor->isWasmFrame()) {
+                std::optional<unsigned> wasmFunctionIndex = visitor->wasmFunctionIndex();
+                m_results.append(StackFrame::wasm(wasmFunctionIndex ? *wasmFunctionIndex : StackFrame::invalidWasmIndex));
+            } else if (!!visitor->codeBlock() && !visitor->codeBlock()->unlinkedCodeBlock()->isBuiltinFunction()) {
                 m_results.append(
                     StackFrame(m_vm, visitor->callee().asCell(), visitor->codeBlock(), visitor->bytecodeOffset()));

trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp

@@ -164 +164 @@
         m_frame.m_codeBlock = nullptr;
         m_frame.m_bytecodeOffset = 0;
+#if ENABLE(WEBASSEMBLY)
+        CalleeBits bits = callFrame->callee();
+        if (bits.isWasm())
+            m_frame.m_wasmFunctionIndex = bits.asWasmCallee()->index();
+#endif
     } else {
         m_frame.m_codeBlock = callFrame->codeBlock();
@@ -279 +284 @@
     switch (codeType()) {
     case CodeType::Wasm:
-        traceLine = ASCIILiteral("wasm code");
+        if (m_wasmFunctionIndex)
+            traceLine = makeString("wasm function index: ", String::number(*m_wasmFunctionIndex));
+        else
+            traceLine = ASCIILiteral("wasm function");
         break;
     case CodeType::Eval:

trunk/Source/JavaScriptCore/interpreter/StackVisitor.h

@@ -78 +78 @@
         bool isInlinedFrame() const { return !!inlineCallFrame(); }
         bool isWasmFrame() const;
+        std::optional<unsigned> const wasmFunctionIndex()
+        {
+            ASSERT(isWasmFrame());
+            return m_wasmFunctionIndex;
+        }
 
         JS_EXPORT_PRIVATE String functionName() const;
@@ -117 +122 @@
         size_t m_argumentCountIncludingThis;
         unsigned m_bytecodeOffset;
+        std::optional<unsigned> m_wasmFunctionIndex;
         bool m_callerIsVMEntryFrame : 1;
         bool m_isWasmFrame : 1;