536e96cc1a
Previously the inspector was trying to handle step-out for async
functions by annotating the async stacks, but this was merely a
hack and didn't work reliably
(a) when the async caller that is `await`ing the result of the
callee was still in the synchronous part (because then there
was no async task yet in the inspector), or
(b) not at all when the async stack tracking wasn't enabled or the
maximum async stack depth was too small.
This CL replaces that hack with a pragmatic solution inside the
V8 debugger, where upon `await` we memorize the async function
object of the caller on the outer promise of the callee, and when
stepping out of the callee we check whether the returned promise
has a memorized async function object and if so, we schedule that
to resume.
This CL thereby effectively reverts https://crrev.com/c/1054618
and replaces it with a V8 debug solution, and thereby further
reduces the (memory) overhead of an AsyncStackTrace.
Fixed: chromium:1246867
Bug: v8:6161, v8:7753, chromium:1277451, chromium:1280519
Change-Id: I6aa79e90f49d204f66bfd37e7a328c7fb8d635b1
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3439865
Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
Auto-Submit: Benedikt Meurer <bmeurer@chromium.org>
Commit-Queue: Benedikt Meurer <bmeurer@chromium.org>
Cr-Commit-Position: refs/heads/main@{#78990}
111 lines
3.5 KiB
JavaScript
111 lines
3.5 KiB
JavaScript
// Copyright 2017 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.
|
|
|
|
let {session, contextGroup, Protocol} = InspectorTest.start('StepOut from return position of async function.');
|
|
|
|
contextGroup.addScript(`
|
|
async function testFunction() {
|
|
async function foo() {
|
|
var p = Promise.resolve();
|
|
await p;
|
|
p.then(() => 1);
|
|
debugger;
|
|
return p;
|
|
}
|
|
await foo();
|
|
}
|
|
`);
|
|
|
|
session.setupScriptMap();
|
|
|
|
InspectorTest.runAsyncTestSuite([
|
|
async function testStepIntoAtReturnPosition() {
|
|
await Promise.all([
|
|
Protocol.Runtime.enable(),
|
|
Protocol.Debugger.enable(),
|
|
]);
|
|
const evalPromise =
|
|
Protocol.Runtime.evaluate({expression: 'testFunction()'});
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
await Protocol.Debugger.stepInto();
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
await Protocol.Debugger.stepInto();
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
await Protocol.Debugger.stepInto();
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
await Promise.all([
|
|
Protocol.Debugger.resume(),
|
|
evalPromise,
|
|
Protocol.Debugger.disable(),
|
|
Protocol.Runtime.disable(),
|
|
]);
|
|
},
|
|
|
|
async function testStepOverAtReturnPosition() {
|
|
await Promise.all([
|
|
Protocol.Runtime.enable(),
|
|
Protocol.Debugger.enable(),
|
|
]);
|
|
const evalPromise =
|
|
Protocol.Runtime.evaluate({expression: 'testFunction()'});
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
await Protocol.Debugger.stepInto();
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
await Protocol.Debugger.stepInto();
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
await Protocol.Debugger.stepOver();
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
await Promise.all([
|
|
Protocol.Debugger.resume(),
|
|
evalPromise,
|
|
Protocol.Debugger.disable(),
|
|
Protocol.Runtime.disable(),
|
|
]);
|
|
},
|
|
|
|
async function testStepOutAtReturnPosition() {
|
|
await Promise.all([
|
|
Protocol.Runtime.enable(),
|
|
Protocol.Debugger.enable(),
|
|
]);
|
|
const evalPromise =
|
|
Protocol.Runtime.evaluate({expression: 'testFunction()'});
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
await Protocol.Debugger.stepInto();
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
await Protocol.Debugger.stepInto();
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
await Protocol.Debugger.stepOut();
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
await Promise.all([
|
|
Protocol.Debugger.resume(),
|
|
evalPromise,
|
|
Protocol.Debugger.disable(),
|
|
Protocol.Runtime.disable(),
|
|
]);
|
|
},
|
|
|
|
async function testStepOut() {
|
|
await Promise.all([
|
|
Protocol.Runtime.enable(),
|
|
Protocol.Debugger.enable(),
|
|
]);
|
|
const evalPromise =
|
|
Protocol.Runtime.evaluate({expression: 'testFunction()'});
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
await Protocol.Debugger.stepOut();
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
await Promise.all([
|
|
Protocol.Debugger.resume(),
|
|
evalPromise,
|
|
Protocol.Debugger.disable(),
|
|
Protocol.Runtime.disable(),
|
|
]);
|
|
},
|
|
]);
|
|
|
|
function logPauseLocation(message) {
|
|
return session.logSourceLocation(message.params.callFrames[0].location);
|
|
}
|