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}
112 lines
3.2 KiB
JavaScript
112 lines
3.2 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('Checks stepping with blackboxed frames on stack');
|
|
|
|
contextGroup.addInlineScript(
|
|
`
|
|
function frameworkCall(funcs) {
|
|
for (var f of funcs) f();
|
|
}
|
|
|
|
function frameworkBreakAndCall(funcs) {
|
|
inspector.breakProgram('', '');
|
|
for (var f of funcs) f();
|
|
}`,
|
|
'framework.js');
|
|
|
|
contextGroup.addInlineScript(
|
|
`
|
|
function userFoo() {
|
|
return 1;
|
|
}
|
|
|
|
function userBoo() {
|
|
return 2;
|
|
}
|
|
|
|
function testStepFromUser() {
|
|
frameworkCall([userFoo, userBoo])
|
|
}
|
|
|
|
function testStepFromFramework() {
|
|
frameworkBreakAndCall([userFoo, userBoo]);
|
|
}`,
|
|
'user.js');
|
|
|
|
session.setupScriptMap();
|
|
|
|
Protocol.Debugger.enable()
|
|
.then(
|
|
() => Protocol.Debugger.setBlackboxPatterns(
|
|
{patterns: ['framework\.js']}))
|
|
.then(() => InspectorTest.runTestSuite(testSuite));
|
|
|
|
var testSuite = [
|
|
function testStepIntoFromUser(next) {
|
|
contextGroup.schedulePauseOnNextStatement('', '');
|
|
test('testStepFromUser()', [
|
|
'print', // before testStepFromUser call
|
|
'stepInto', 'stepInto', 'print', // userFoo
|
|
'stepInto', 'stepInto', 'print', // userBoo
|
|
'stepInto', 'stepInto', 'print' // testStepFromUser
|
|
]).then(next);
|
|
},
|
|
|
|
function testStepOverFromUser(next) {
|
|
contextGroup.schedulePauseOnNextStatement('', '');
|
|
test('testStepFromUser()', [
|
|
'print', // before testStepFromUser call
|
|
'stepInto', 'stepInto', 'print', // userFoo
|
|
'stepOver', 'stepOver', 'print', // userBoo
|
|
'stepOver', 'stepOver', 'print' // testStepFromUser
|
|
]).then(next);
|
|
},
|
|
|
|
function testStepOutFromUser(next) {
|
|
contextGroup.schedulePauseOnNextStatement('', '');
|
|
test('testStepFromUser()', [
|
|
'print', // before testStepFromUser call
|
|
'stepInto', 'stepInto', 'print', // userFoo
|
|
'stepOut', 'print' // testStepFromUser
|
|
]).then(next);
|
|
},
|
|
|
|
function testStepIntoFromFramework(next) {
|
|
test('testStepFromFramework()', [
|
|
'print', // frameworkBreakAndCall
|
|
'stepInto', 'print', // userFoo
|
|
]).then(next);
|
|
},
|
|
|
|
function testStepOverFromFramework(next) {
|
|
test('testStepFromFramework()', [
|
|
'print', // frameworkBreakAndCall
|
|
'stepOver', 'print', // testStepFromFramework
|
|
]).then(next);
|
|
},
|
|
|
|
function testStepOutFromFramework(next) {
|
|
test('testStepFromFramework()', [
|
|
'print', // frameworkBreakAndCall
|
|
'stepOut', 'print', // testStepFromFramework
|
|
]).then(next);
|
|
}
|
|
];
|
|
|
|
function test(entryExpression, actions) {
|
|
Protocol.Debugger.onPaused(message => {
|
|
var action = actions.shift() || 'resume';
|
|
if (action === 'print') {
|
|
session.logCallFrames(message.params.callFrames);
|
|
InspectorTest.log('');
|
|
action = actions.shift() || 'resume';
|
|
}
|
|
if (action) InspectorTest.log(`Executing ${action}...`);
|
|
Protocol.Debugger[action]();
|
|
});
|
|
return Protocol.Runtime.evaluate(
|
|
{expression: entryExpression + '//# sourceURL=expr.js'});
|
|
}
|