reapply 5dd8842 change

Author: sosukesuzuki

Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -505,9 +505,9 @@ void Interpreter::getAsyncStackTrace(JSCell* owner, Vector<StackFrame>& results,
                 // If a CodeBlock doesn't already exist, the stack trace will only show the filename and won't show line column
                 if (CodeBlock* codeBlock = executable->codeBlockForCall()) {
                     BytecodeIndex bytecodeIndex = computeBytecodeIndex(codeBlock, currentGenerator);
-                    results.append(StackFrame(vm, owner, asyncFunction, codeBlock, bytecodeIndex));
+                    results.append(StackFrame(vm, owner, asyncFunction, codeBlock, bytecodeIndex, /* isAsyncFrame */ true));
                 } else
-                    results.append(StackFrame(vm, owner, asyncFunction, /* isAsyncFrameWithoutCodeBlock */ true));
+                    results.append(StackFrame(vm, owner, asyncFunction, /* isAsyncFrame */ true));
             }
         }
         currentGenerator = getParentGenerator(currentGenerator);

Source/JavaScriptCore/runtime/StackFrame.cpp

@@ -52,6 +52,16 @@ StackFrame::StackFrame(VM& vm, JSCell* owner, JSCell* callee, CodeBlock* codeBlo
 {
 }
 
+StackFrame::StackFrame(VM& vm, JSCell* owner, JSCell* callee, CodeBlock* codeBlock, BytecodeIndex bytecodeIndex, bool isAsyncFrame)
+    : m_frameData(JSFrameData {
+        WriteBarrier<JSCell>(vm, owner, callee),
+        WriteBarrier<CodeBlock>(vm, owner, codeBlock),
+        bytecodeIndex,
+        isAsyncFrame
+    })
+{
+}
+
 StackFrame::StackFrame(VM& vm, JSCell* owner, CodeBlock* codeBlock, BytecodeIndex bytecodeIndex)
     : m_frameData(JSFrameData {
         WriteBarrier<JSCell>(),
@@ -71,12 +81,12 @@ StackFrame::StackFrame(Wasm::IndexOrName indexOrName, size_t functionIndex)
 {
 }
 
-StackFrame::StackFrame(VM& vm, JSCell* owner, JSCell* callee, bool isAsyncFrameWithoutCodeBlock)
+StackFrame::StackFrame(VM& vm, JSCell* owner, JSCell* callee, bool isAsyncFrame)
     : m_frameData(JSFrameData {
         WriteBarrier<JSCell>(vm, owner, callee),
         WriteBarrier<CodeBlock>(),
         BytecodeIndex(),
-        isAsyncFrameWithoutCodeBlock
+        isAsyncFrame
     })
 {
 }
@@ -147,7 +157,7 @@ String StackFrame::sourceURL(VM& vm) const
 {
     return WTF::switchOn(m_frameData,
         [&vm, this](const JSFrameData& jsFrame) -> String {
-            if (jsFrame.m_isAsyncFrameWithoutCodeBlock) {
+            if (isAsyncFrameWithoutCodeBlock()) {
                 ASSERT(jsFrame.callee);
                 ASSERT(!jsFrame.codeBlock);
                 JSFunction* calleeFn = jsDynamicCast<JSFunction*>(jsFrame.callee.get());
@@ -171,7 +181,7 @@ String StackFrame::sourceURLStripped(VM& vm) const
 {
     return WTF::switchOn(m_frameData,
         [&vm, this](const JSFrameData& jsFrame) -> String {
-            if (jsFrame.m_isAsyncFrameWithoutCodeBlock) {
+            if (isAsyncFrameWithoutCodeBlock()) {
                 ASSERT(jsFrame.callee);
                 ASSERT(!jsFrame.codeBlock);
                 JSFunction* calleeFn = jsDynamicCast<JSFunction*>(jsFrame.callee.get());
@@ -214,7 +224,14 @@ String StackFrame::functionName(VM& vm) const
                 if (auto* executable = jsDynamicCast<FunctionExecutable*>(jsFrame.codeBlock->ownerExecutable()))
                     name = executable->ecmaName().impl();
             }
-            return name.isNull() ? emptyString() : name;
+
+            if (name.isNull())
+                return emptyString();
+
+            if (jsFrame.m_isAsyncFrame)
+                return makeString("async "_s, name);
+
+            return name;
         },
         [](const WasmFrameData& wasmFrame) -> String {
             if (wasmFrame.functionIndexOrName.isEmpty() || !wasmFrame.functionIndexOrName.nameSection())

Source/JavaScriptCore/runtime/StackFrame.h

@@ -44,7 +44,7 @@ struct JSFrameData {
     WriteBarrier<JSCell> callee;
     WriteBarrier<CodeBlock> codeBlock;
     BytecodeIndex bytecodeIndex;
-    bool m_isAsyncFrameWithoutCodeBlock { false };
+    bool m_isAsyncFrame { false };
 };
 
 struct WasmFrameData {
@@ -58,8 +58,9 @@ class StackFrame {
 
     StackFrame(VM&, JSCell* owner, JSCell* callee);
     StackFrame(VM&, JSCell* owner, JSCell* callee, CodeBlock*, BytecodeIndex);
+    StackFrame(VM&, JSCell* owner, JSCell* callee, CodeBlock*, BytecodeIndex, bool isAsyncFrame);
     StackFrame(VM&, JSCell* owner, CodeBlock*, BytecodeIndex);
-    StackFrame(VM&, JSCell* owner, JSCell* callee, bool isAsyncFrameWithoutCodeBlock);
+    StackFrame(VM&, JSCell* owner, JSCell* callee, bool isAsyncFrame);
     StackFrame(Wasm::IndexOrName);
     StackFrame(Wasm::IndexOrName, size_t functionIndex);
     StackFrame() = default;
@@ -97,6 +98,13 @@ class StackFrame {
         return false;
     }
 
+    bool isAsyncFrameWithoutCodeBlock() const
+    {
+        if (auto* jsFrame = std::get_if<JSFrameData>(&m_frameData))
+            return jsFrame->m_isAsyncFrame && !codeBlock();
+        return false;
+    }
+
     LineColumn computeLineAndColumn() const;
     String functionName(VM&) const;
     SourceID sourceID() const;
@@ -116,4 +124,4 @@ class StackFrame {
     FrameData m_frameData { JSFrameData { } };
 };
 
-} // namespace JSC
+} // namespace JSC