[debugger] tuned StepNext and StepOut at return position
Proposed behaviour:
- StepNext at return position go into next function call (no changes with current behavior, but implemented in v8::Debug instead of hack on inspector side);
- StepOut at return position go into next non-current function call.
We need this to have better stepping in cases with native functions, blackboxed functions and/or different embedder calls (e.g. event listeners).
New behavior could be illustrated with two examples (for more see stepping-with-natives-and-frameworks test):
- let's assume that we've blackboxed callAll function, this function just takes its arguments and call one after another:
var foo = () => 1;
callAll(foo, foo, () => 2);
If we break inside of first call of function foo. Then on..
..StepNext - we're able to reach second call of function foo,
..StepOut - we're able to reach () => 2 call.
- let's consider case with native function:
[1,2,3].map(x => x * 2)
If we break inside of first callback call, then with StepNext we can iterate through all calls of callback, with StepOut we go to next statement after .map call.
Implementation details:
- when we request break we schedule step-in function call for any step action at return position and for step-in at any position,
- when we request StepOut at return position - we mark current function as needed-to-be-ignored inside of PrepareStepIn(function) call,
- when we request StepOut at not return position - we set break at return position and ask debugger to just repeat last step action on next stepping-related break.
Design doc: https://docs.google.com/document/d/1ihXHOIhP_q-fJCA0e2EiXz_Zr3B08KMjaPifcaqZ60Q/edit
BUG=v8:6118,chromium:583193
R=dgozman@chromium.org,yangguo@chromium.org
Review-Url: https://codereview.chromium.org/2758483002
Cr-Commit-Position: refs/heads/master@{#44028}
2017-03-22 14:16:18 +00:00
|
|
|
// 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.
|
|
|
|
|
|
|
|
|
|
InspectorTest.log('Stepping with natives and frameworks.');
|
|
|
|
|
|
|
|
|
|
InspectorTest.addScript(`
|
|
|
|
|
function callAll() {
|
|
|
|
|
for (var f of arguments)
|
|
|
|
|
f();
|
|
|
|
|
}
|
|
|
|
|
//# sourceURL=framework.js`);
|
|
|
|
|
|
|
|
|
|
InspectorTest.setupScriptMap();
|
2017-03-22 18:07:12 +00:00
|
|
|
InspectorTest.logProtocolCommandCalls('Debugger.pause');
|
|
|
|
|
InspectorTest.logProtocolCommandCalls('Debugger.stepInto');
|
|
|
|
|
InspectorTest.logProtocolCommandCalls('Debugger.stepOver');
|
|
|
|
|
InspectorTest.logProtocolCommandCalls('Debugger.stepOut');
|
|
|
|
|
InspectorTest.logProtocolCommandCalls('Debugger.resume');
|
[debugger] tuned StepNext and StepOut at return position
Proposed behaviour:
- StepNext at return position go into next function call (no changes with current behavior, but implemented in v8::Debug instead of hack on inspector side);
- StepOut at return position go into next non-current function call.
We need this to have better stepping in cases with native functions, blackboxed functions and/or different embedder calls (e.g. event listeners).
New behavior could be illustrated with two examples (for more see stepping-with-natives-and-frameworks test):
- let's assume that we've blackboxed callAll function, this function just takes its arguments and call one after another:
var foo = () => 1;
callAll(foo, foo, () => 2);
If we break inside of first call of function foo. Then on..
..StepNext - we're able to reach second call of function foo,
..StepOut - we're able to reach () => 2 call.
- let's consider case with native function:
[1,2,3].map(x => x * 2)
If we break inside of first callback call, then with StepNext we can iterate through all calls of callback, with StepOut we go to next statement after .map call.
Implementation details:
- when we request break we schedule step-in function call for any step action at return position and for step-in at any position,
- when we request StepOut at return position - we mark current function as needed-to-be-ignored inside of PrepareStepIn(function) call,
- when we request StepOut at not return position - we set break at return position and ask debugger to just repeat last step action on next stepping-related break.
Design doc: https://docs.google.com/document/d/1ihXHOIhP_q-fJCA0e2EiXz_Zr3B08KMjaPifcaqZ60Q/edit
BUG=v8:6118,chromium:583193
R=dgozman@chromium.org,yangguo@chromium.org
Review-Url: https://codereview.chromium.org/2758483002
Cr-Commit-Position: refs/heads/master@{#44028}
2017-03-22 14:16:18 +00:00
|
|
|
|
|
|
|
|
Protocol.Debugger.enable();
|
|
|
|
|
Protocol.Debugger.setBlackboxPatterns({patterns: ['framework\.js']});
|
|
|
|
|
InspectorTest.runAsyncTestSuite([
|
|
|
|
|
async function testNativeCodeStepOut() {
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({expression: '[1,2].map(v => v);'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOut();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testNativeCodeStepOver() {
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({expression: '[1,2].map(v => v);'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testNativeCodeStepInto() {
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({expression: '[1,2].map(v => v);'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testFrameworkCodeStepInto() {
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({expression: 'callAll(() => 1, () => 2);'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testFrameworkCodeStepOver() {
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({expression: 'callAll(() => 1, () => 2);'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testFrameworkCodeStepOut() {
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({expression: 'callAll(() => 1, () => 2);'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOut();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOut();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testFrameworkNextCallDeeperStepOut() {
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({
|
|
|
|
|
expression: 'callAll(() => 1, callAll.bind(null, () => 2));'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOut();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOut();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testFrameworkNextCallDeeperStepOutSameFunction() {
|
|
|
|
|
await Protocol.Runtime.evaluate({expression: 'foo = () => 1'});
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({
|
|
|
|
|
expression: 'callAll(foo, callAll.bind(null, foo));'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOut();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testFrameworkNextCallDeeperStepInto() {
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({
|
|
|
|
|
expression: 'callAll(() => 1, callAll.bind(null, () => 2));'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testFrameworkNextCallDeeperStepOver() {
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({
|
|
|
|
|
expression: 'callAll(() => 1, callAll.bind(null, () => 2));'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testFrameworkCurrentCallDeeperStepOut() {
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({
|
|
|
|
|
expression: 'callAll(callAll.bind(null, () => 1), () => 2);'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOut();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOut();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testFrameworkCurrentCallDeeperStepOutSameFunction() {
|
|
|
|
|
await Protocol.Runtime.evaluate({expression: 'foo = () => 1'});
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({
|
|
|
|
|
expression: 'callAll(callAll.bind(null, foo), foo);'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOut();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testFrameworkCurrentCallDeeperStepOver() {
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({
|
|
|
|
|
expression: 'callAll(callAll.bind(null, () => 1), () => 2);'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testFrameworkCurrentCallDeeperStepInto() {
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({
|
|
|
|
|
expression: 'callAll(callAll.bind(null, () => 1), () => 2);'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testFrameworkStepOverMixed() {
|
|
|
|
|
await Protocol.Runtime.evaluate({expression: 'foo = () => 1'});
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({
|
|
|
|
|
expression: 'callAll(foo, foo, () => 2);'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testFrameworkStepOutMixed() {
|
|
|
|
|
await Protocol.Runtime.evaluate({expression: 'foo = () => 1'});
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({
|
|
|
|
|
expression: 'callAll(foo, foo, () => 2);'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOut();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOut();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
async function testStepOutFrameworkSameFunctionAtReturn() {
|
|
|
|
|
await Protocol.Runtime.evaluate({expression: 'foo = () => 1'});
|
|
|
|
|
Protocol.Debugger.pause();
|
|
|
|
|
Protocol.Runtime.evaluate({
|
|
|
|
|
expression: 'callAll(foo, foo, () => 2);'});
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepInto();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOver();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOut();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
Protocol.Debugger.stepOut();
|
|
|
|
|
await logPauseLocation(await Protocol.Debugger.oncePaused());
|
|
|
|
|
await Protocol.Debugger.resume();
|
|
|
|
|
}
|
|
|
|
|
]);
|
|
|
|
|
|
|
|
|
|
function logPauseLocation(message) {
|
|
|
|
|
return InspectorTest.logSourceLocation(message.params.callFrames[0].location);
|
|
|
|
|
}
|