a81e8d16f4
Previously the `Debugger.CallFrame`s in `Debugger.paused` events would report locations relative to the surrounding document in case of inline scripts with `//@ sourceURL` annotations (while `Runtime.CallFrame` was already fixed previously as part of crrev.com/c/3069289). With this CL the locations in `Debugger.CallFrame` are also appropriately adjusted. Drive-by-fix: Several inspector tests were (incorrectly) relying on this wrong treatment, and were also unnecessarily using //# sourceURL annotations. So part of this CL also addresses that problem and makes the tests more robust, using addInlineScript() helper. Fixed: chromium:1283049 Bug: chromium:1183990, chromium:578269 Change-Id: I6e3b215d951c3453c0a9cfc9bccf3dc3d5e92fd6 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3359619 Auto-Submit: Benedikt Meurer <bmeurer@chromium.org> Reviewed-by: Yang Guo <yangguo@chromium.org> Commit-Queue: Yang Guo <yangguo@chromium.org> Cr-Commit-Position: refs/heads/main@{#78450}
144 lines
4.7 KiB
JavaScript
144 lines
4.7 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('Check that continue-to-location works with different strategies.');
|
|
|
|
contextGroup.addInlineScript(
|
|
`
|
|
async function asyncFact(n) {
|
|
if (n == 0) return 1;
|
|
let r = n * await asyncFact(n - 1);
|
|
console.log(r);
|
|
return r;
|
|
}
|
|
|
|
function fact(n) {
|
|
if (n == 0) return 1;
|
|
let r = n * fact(n - 1);
|
|
console.log(r);
|
|
return r;
|
|
}
|
|
|
|
function topLevel() {
|
|
eval(` +
|
|
'`' +
|
|
`
|
|
var a = 1;
|
|
var b = 2;
|
|
fact(3);
|
|
console.log(a + b);
|
|
` +
|
|
'`' +
|
|
`);
|
|
}`,
|
|
'test.js');
|
|
|
|
session.setupScriptMap();
|
|
InspectorTest.runAsyncTestSuite([
|
|
async function testAwaitAny() {
|
|
Protocol.Debugger.enable();
|
|
Protocol.Debugger.setAsyncCallStackDepth({ maxDepth: 128 });
|
|
Protocol.Debugger.pause();
|
|
Protocol.Runtime.evaluate({expression: 'asyncFact(4)//# sourceURL=expr.js'});
|
|
await pausedAndDumpStack();
|
|
Protocol.Debugger.stepInto();
|
|
let message = await pausedAndDumpStack();
|
|
let location = message.params.callFrames[0].location;
|
|
location.lineNumber = 11;
|
|
Protocol.Debugger.continueToLocation({location, targetCallFrames: 'any'});
|
|
await pausedAndDumpStack();
|
|
Protocol.Debugger.disable();
|
|
},
|
|
|
|
async function testAwaitCurrent() {
|
|
Protocol.Debugger.enable();
|
|
Protocol.Debugger.setAsyncCallStackDepth({ maxDepth: 128 });
|
|
Protocol.Debugger.pause();
|
|
Protocol.Runtime.evaluate({expression: 'asyncFact(4)//# sourceURL=expr.js'});
|
|
await pausedAndDumpStack();
|
|
Protocol.Debugger.stepInto();
|
|
let message = await pausedAndDumpStack();
|
|
let location = message.params.callFrames[0].location;
|
|
location.lineNumber = 11;
|
|
Protocol.Debugger.continueToLocation({location, targetCallFrames: 'current'});
|
|
await pausedAndDumpStack();
|
|
await Protocol.Debugger.resume();
|
|
Protocol.Debugger.disable();
|
|
},
|
|
|
|
async function testAny() {
|
|
Protocol.Debugger.enable();
|
|
Protocol.Debugger.setAsyncCallStackDepth({ maxDepth: 128 });
|
|
Protocol.Debugger.pause();
|
|
Protocol.Runtime.evaluate({expression: 'fact(4)//# sourceURL=expr.js'});
|
|
await pausedAndDumpStack();
|
|
Protocol.Debugger.stepInto();
|
|
let message = await pausedAndDumpStack();
|
|
let location = message.params.callFrames[0].location;
|
|
location.lineNumber = 18;
|
|
Protocol.Debugger.continueToLocation({location, targetCallFrames: 'any'});
|
|
await pausedAndDumpStack();
|
|
Protocol.Debugger.disable();
|
|
},
|
|
|
|
async function testCurrent() {
|
|
Protocol.Debugger.enable();
|
|
Protocol.Debugger.setAsyncCallStackDepth({ maxDepth: 128 });
|
|
Protocol.Debugger.pause();
|
|
Protocol.Runtime.evaluate({expression: 'fact(4)//# sourceURL=expr.js'});
|
|
await pausedAndDumpStack();
|
|
Protocol.Debugger.stepInto();
|
|
let message = await pausedAndDumpStack();
|
|
let location = message.params.callFrames[0].location;
|
|
location.lineNumber = 18;
|
|
Protocol.Debugger.continueToLocation({location, targetCallFrames: 'current'});
|
|
await pausedAndDumpStack();
|
|
await Protocol.Debugger.resume();
|
|
Protocol.Debugger.disable();
|
|
},
|
|
|
|
async function testTopLevelAny() {
|
|
Protocol.Debugger.enable();
|
|
Protocol.Debugger.setAsyncCallStackDepth({ maxDepth: 128 });
|
|
Protocol.Debugger.pause();
|
|
Protocol.Runtime.evaluate({expression: 'topLevel()//# sourceURL=expr.js'});
|
|
await pausedAndDumpStack();
|
|
Protocol.Debugger.stepInto();
|
|
await pausedAndDumpStack();
|
|
Protocol.Debugger.stepInto();
|
|
let message = await pausedAndDumpStack();
|
|
let location = message.params.callFrames[0].location;
|
|
location.lineNumber = 4;
|
|
Protocol.Debugger.continueToLocation({location, targetCallFrames: 'any'});
|
|
await pausedAndDumpStack();
|
|
Protocol.Debugger.disable();
|
|
},
|
|
|
|
async function testTopLevelCurrent() {
|
|
Protocol.Debugger.enable();
|
|
Protocol.Debugger.setAsyncCallStackDepth({ maxDepth: 128 });
|
|
Protocol.Debugger.pause();
|
|
Protocol.Runtime.evaluate({expression: 'topLevel()//# sourceURL=expr.js'});
|
|
await pausedAndDumpStack();
|
|
Protocol.Debugger.stepInto();
|
|
await pausedAndDumpStack();
|
|
Protocol.Debugger.stepInto();
|
|
let message = await pausedAndDumpStack();
|
|
let location = message.params.callFrames[0].location;
|
|
location.lineNumber = 4;
|
|
Protocol.Debugger.continueToLocation({location, targetCallFrames: 'current'});
|
|
await pausedAndDumpStack();
|
|
await Protocol.Debugger.resume();
|
|
Protocol.Debugger.disable();
|
|
}
|
|
]);
|
|
|
|
async function pausedAndDumpStack() {
|
|
let message = await Protocol.Debugger.oncePaused();
|
|
session.logCallFrames(message.params.callFrames);
|
|
session.logAsyncStackTrace(message.params.asyncStackTrace);
|
|
InspectorTest.log('');
|
|
return message;
|
|
}
|