Improve stack traces for async functions

src/inspector/v8-stack-trace-impl.cc

 // Copyright 2016 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/inspector/v8-stack-trace-impl.h"
 
 #include "src/inspector/string-util.h"
 #include "src/inspector/v8-debugger.h"
 #include "src/inspector/v8-inspector-impl.h"
 #include "src/inspector/v8-profiler-agent-impl.h"
@@ skipping 25 matching lines @@
     functionName = toProtocolString(functionNameValue);
 
   int sourceLineNumber = frame->GetLineNumber();
   int sourceColumn = frame->GetColumn();
   return V8StackTraceImpl::Frame(functionName, scriptId, sourceName,
                                  sourceLineNumber, sourceColumn);
 }
 
 void toFramesVector(v8::Local<v8::StackTrace> stackTrace,
                     std::vector<V8StackTraceImpl::Frame>& frames,
-                    size_t maxStackSize, v8::Isolate* isolate) {
+                    size_t maxStackSize, v8::Isolate* isolate,
+                    bool skipInitialFrame) {
   DCHECK(isolate->InContext());
   int frameCount = stackTrace->GetFrameCount();
   if (frameCount > static_cast<int>(maxStackSize))
     frameCount = static_cast<int>(maxStackSize);
-  for (int i = 0; i < frameCount; i++) {
+  for (int i = skipInitialFrame ? 1 : 0; i < frameCount; i++) {
     v8::Local<v8::StackFrame> stackFrame = stackTrace->GetFrame(i);
     frames.push_back(toFrame(stackFrame));
   }
 }
 
 }  //  namespace
 
 V8StackTraceImpl::Frame::Frame()
     : m_functionName("undefined"),
       m_scriptId(""),
@@ skipping 39 matching lines @@
 void V8StackTraceImpl::setCaptureStackTraceForUncaughtExceptions(
     v8::Isolate* isolate, bool capture) {
   isolate->SetCaptureStackTraceForUncaughtExceptions(
       capture, V8StackTraceImpl::maxCallStackSizeToCapture, stackTraceOptions);
 }
 
 // static
 std::unique_ptr<V8StackTraceImpl> V8StackTraceImpl::create(
     V8Debugger* debugger, int contextGroupId,
     v8::Local<v8::StackTrace> stackTrace, size_t maxStackSize,
-    const String16& description) {
+    const String16& description, bool skipInitialFrame) {
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
   v8::HandleScope scope(isolate);
   std::vector<V8StackTraceImpl::Frame> frames;
   if (!stackTrace.IsEmpty())
-    toFramesVector(stackTrace, frames, maxStackSize, isolate);
+    toFramesVector(stackTrace, frames, maxStackSize, isolate, skipInitialFrame);
 
   int maxAsyncCallChainDepth = 1;
   V8StackTraceImpl* asyncCallChain = nullptr;
   if (debugger && maxStackSize > 1) {
     asyncCallChain = debugger->currentAsyncCallChain();
     maxAsyncCallChainDepth = debugger->maxAsyncCallChainDepth();
   }
   // Do not accidentally append async call chain from another group. This should
   // not
   // happen if we have proper instrumentation, but let's double-check to be
@@ skipping 19 matching lines @@
   V8StackTraceImpl* deepest = result.get();
   while (deepest && maxAsyncCallChainDepth) {
     deepest = deepest->m_parent.get();
     maxAsyncCallChainDepth--;
   }
   if (deepest) deepest->m_parent.reset();
 
   return result;
 }
 
+// static
 std::unique_ptr<V8StackTraceImpl> V8StackTraceImpl::capture(
     V8Debugger* debugger, int contextGroupId, size_t maxStackSize,
-    const String16& description) {
+    const String16& description, bool skipInitialFrame) {
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
   v8::HandleScope handleScope(isolate);
   v8::Local<v8::StackTrace> stackTrace;
   if (isolate->InContext()) {
     if (debugger) {
       V8InspectorImpl* inspector = debugger->inspector();
       V8ProfilerAgentImpl* profilerAgent =
           inspector->enabledProfilerAgentForGroup(contextGroupId);
       if (profilerAgent) profilerAgent->collectSample();
     }
     stackTrace = v8::StackTrace::CurrentStackTrace(
         isolate, static_cast<int>(maxStackSize), stackTraceOptions);
   }
   return V8StackTraceImpl::create(debugger, contextGroupId, stackTrace,
-                                  maxStackSize, description);
+                                  maxStackSize, description, skipInitialFrame);
 }
 
 std::unique_ptr<V8StackTraceImpl> V8StackTraceImpl::cloneImpl() {
   std::vector<Frame> framesCopy(m_frames);
   return wrapUnique(
       new V8StackTraceImpl(m_contextGroupId, m_description, framesCopy,
                            m_parent ? m_parent->cloneImpl() : nullptr));
 }
 
 std::unique_ptr<V8StackTrace> V8StackTraceImpl::clone() {
@@ skipping 87 matching lines @@
     stackTrace.append(String16::fromInteger(frame.lineNumber()));
     stackTrace.append(':');
     stackTrace.append(String16::fromInteger(frame.columnNumber()));
     stackTrace.append(')');
   }
   String16 string = stackTrace.toString();
   return StringBufferImpl::adopt(string);
 }
 
 }  // namespace v8_inspector