[vm/debugger] Have debug step check point after debugger() call.

Fixes #46006
TEST=ci

Change-Id: I89a7ad248b75204d1754668cfb23c8d98f554b28
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/310779
Reviewed-by: Ryan Macnak <[email protected]>
Commit-Queue: Alexander Aprelev <[email protected]>

Author: aam

pkg/vm_service/test/async_next_regression_18877_test.dart

@@ -8,9 +8,10 @@ import 'dart:developer';
 import 'common/service_test_common.dart';
 import 'common/test_helper.dart';
 
-const int LINE_A = 24;
-const int LINE_B = 25;
-const int LINE_C = 26;
+const int LINE_D = 24;
+const int LINE_A = 25;
+const int LINE_B = 26;
+const int LINE_C = 27;
 
 foo() async {}
 
@@ -20,7 +21,7 @@ doAsync(stop) async {
   // an await causes the implicit breakpoint to be set for that closure instead
   // of the async_op, resulting in the debugger falling through.
   final baz = () => print('doAsync($stop) done!');
-  if (stop) debugger();
+  if (stop) debugger(); // LINE D
   await foo(); // Line A.
   await foo(); // Line B.
   await foo(); // Line C.
@@ -37,6 +38,8 @@ testMain() {
 
 var tests = <IsolateTest>[
   hasStoppedAtBreakpoint,
+  stoppedAtLine(LINE_D),
+  stepOver, // foo()
   stoppedAtLine(LINE_A),
   stepOver, // foo()
   stoppedAtLine(LINE_A),

pkg/vm_service/test/async_next_test.dart

@@ -7,9 +7,10 @@ import 'dart:developer';
 import 'common/service_test_common.dart';
 import 'common/test_helper.dart';
 
-const int LINE_A = 18;
-const int LINE_B = 19;
-const int LINE_C = 20;
+const int LINE_D = 18;
+const int LINE_A = 19;
+const int LINE_B = 20;
+const int LINE_C = 21;
 
 foo() async {}
 
@@ -30,6 +31,8 @@ testMain() {
 
 var tests = <IsolateTest>[
   hasStoppedAtBreakpoint,
+  stoppedAtLine(LINE_D),
+  stepOver, // foo()
   stoppedAtLine(LINE_A),
   stepOver, // foo()
   asyncNext,

pkg/vm_service/test/async_single_step_exception_test.dart

@@ -6,21 +6,22 @@ import 'dart:developer';
 import 'common/service_test_common.dart';
 import 'common/test_helper.dart';
 
-const LINE_A = 18;
-const LINE_B = 19;
-const LINE_C = 24;
-const LINE_D = 26;
-const LINE_E = 29;
-const LINE_F = 32;
-const LINE_G = 34;
+const LINE_A = 19;
+const LINE_B = 20;
+const LINE_0 = 24;
+const LINE_C = 25;
+const LINE_D = 27;
+const LINE_E = 30;
+const LINE_F = 33;
+const LINE_G = 35;
 
 helper() async {
   print('helper'); // LINE_A.
   throw 'a'; // LINE_B.
 }
 
 testMain() async {
-  debugger();
+  debugger(); // LINE_0.
   print('mmmmm'); // LINE_C.
   try {
     await helper(); // LINE_D.
@@ -36,6 +37,9 @@ testMain() async {
 
 var tests = <IsolateTest>[
   hasStoppedAtBreakpoint,
+  stoppedAtLine(LINE_0), // debugger
+  stepOver,
+
   stoppedAtLine(LINE_C), // print mmmm
   smartNext,
 

pkg/vm_service/test/async_single_step_into_test.dart

@@ -6,25 +6,29 @@ import 'dart:developer';
 import 'common/service_test_common.dart';
 import 'common/test_helper.dart';
 
-const LINE_A = 15;
-const LINE_B = 16;
-const LINE_C = 21;
-const LINE_D = 22;
+const LINE_A = 16;
+const LINE_B = 17;
+const LINE_0 = 21;
+const LINE_C = 22;
+const LINE_D = 23;
 
 helper() async {
   print('helper'); // LINE_A.
   print('foobar'); // LINE_B.
 }
 
 testMain() {
-  debugger();
+  debugger(); // LINE_0.
   print('mmmmm'); // LINE_C.
   helper(); // LINE_D.
   print('z');
 }
 
 var tests = <IsolateTest>[
   hasStoppedAtBreakpoint,
+  stoppedAtLine(LINE_0),
+  stepOver, // print.
+
   stoppedAtLine(LINE_C),
   stepOver, // print.
 

pkg/vm_service/test/async_single_step_out_test.dart

@@ -6,26 +6,30 @@ import 'dart:developer';
 import 'common/service_test_common.dart';
 import 'common/test_helper.dart';
 
-const LINE_A = 16;
-const LINE_B = 17;
-const LINE_C = 22;
-const LINE_D = 23;
-const LINE_E = 24;
+const LINE_A = 17;
+const LINE_B = 18;
+const LINE_0 = 22;
+const LINE_C = 23;
+const LINE_D = 24;
+const LINE_E = 25;
 
 helper() async {
   print('helper'); // LINE_A.
   return null; // LINE_B.
 }
 
 testMain() async {
-  debugger();
+  debugger(); // LINE_0.
   print('mmmmm'); // LINE_C.
   await helper(); // LINE_D.
   print('z'); // LINE_E.
 }
 
 var tests = <IsolateTest>[
   hasStoppedAtBreakpoint,
+  stoppedAtLine(LINE_0), // debugger
+  stepOver,
+
   stoppedAtLine(LINE_C), // print mmmm
   stepOver,
 

pkg/vm_service/test/async_star_single_step_into_test.dart

@@ -6,13 +6,16 @@ import 'dart:developer';
 import 'common/service_test_common.dart';
 import 'common/test_helper.dart';
 
-const LINE_A = 18;
-const LINE_B = 19;
-const LINE_C = 23;
-const LINE_D = 27;
-const LINE_E = 33;
-const LINE_F = 34;
-const LINE_G = 25;
+const LINE_A = 21;
+const LINE_B = 22;
+const LINE_C = 26;
+const LINE_D = 30;
+const LINE_E = 36;
+const LINE_F = 37;
+const LINE_G = 28;
+
+const LINE_0 = 29;
+const LINE_1 = 35;
 
 foobar() async* {
   yield 1; // LINE_A.
@@ -23,19 +26,23 @@ helper() async {
   print('helper'); // LINE_C.
   // ignore: unused_local_variable
   await for (var i in foobar()) /* LINE_G. */ {
-    debugger();
+    debugger(); // LINE_0.
     print('loop'); // LINE_D.
   }
 }
 
 testMain() {
-  debugger();
+  debugger(); // LINE_1.
   print('mmmmm'); // LINE_E.
   helper(); // LINE_F.
   print('z');
 }
 
 var tests = <IsolateTest>[
+  hasStoppedAtBreakpoint,
+  stoppedAtLine(LINE_1),
+  stepOver, // debugger.
+
   hasStoppedAtBreakpoint,
   stoppedAtLine(LINE_E),
   stepOver, // print.
@@ -62,6 +69,10 @@ var tests = <IsolateTest>[
   // TODO(johnmccutchan): Implement support for step-out of async functions.
   resumeIsolate,
 
+  hasStoppedAtBreakpoint,
+  stoppedAtLine(LINE_0),
+  stepOver, // debugger.
+
   hasStoppedAtBreakpoint,
   stoppedAtLine(LINE_D),
   stepOver, // print.

pkg/vm_service/test/async_star_step_out_test.dart

@@ -6,15 +6,18 @@ import 'dart:developer';
 import 'common/service_test_common.dart';
 import 'common/test_helper.dart';
 
-const LINE_A = 20;
-const LINE_B = 21;
-const LINE_C = 25;
-const LINE_D = 29;
-const LINE_E = 36;
-const LINE_F = 37;
-const LINE_G = 38;
-const LINE_H = 27;
-const LINE_I = 31;
+const LINE_A = 23;
+const LINE_B = 24;
+const LINE_C = 28;
+const LINE_D = 32;
+const LINE_E = 39;
+const LINE_F = 40;
+const LINE_G = 41;
+const LINE_H = 30;
+const LINE_I = 34;
+
+const LINE_0 = 30;
+const LINE_1 = 38;
 
 foobar() async* {
   yield 1; // LINE_A.
@@ -25,20 +28,24 @@ helper() async {
   print('helper'); // LINE_C.
   // ignore: unused_local_variable
   await for (var i in foobar()) /* LINE_H */ {
-    debugger();
+    debugger(); // LINE_0
     print('loop'); // LINE_D.
   }
   return null; // LINE_I.
 }
 
 testMain() {
-  debugger();
+  debugger(); // LINE_1
   print('mmmmm'); // LINE_E.
   helper(); // LINE_F.
   print('z'); // LINE_G.
 }
 
 var tests = <IsolateTest>[
+  hasStoppedAtBreakpoint,
+  stoppedAtLine(LINE_1),
+  stepOver, // debugger.
+
   hasStoppedAtBreakpoint,
   stoppedAtLine(LINE_E),
   stepOver, // print.

pkg/vm_service/test/async_step_out_test.dart

@@ -6,12 +6,14 @@ import 'dart:developer';
 import 'common/service_test_common.dart';
 import 'common/test_helper.dart';
 
-const LINE_A = 17;
-const LINE_B = 18;
-const LINE_C = 19;
-const LINE_D = 24;
-const LINE_E = 25;
-const LINE_F = 26;
+const LINE_A = 19;
+const LINE_B = 20;
+const LINE_C = 21;
+const LINE_D = 26;
+const LINE_E = 27;
+const LINE_F = 28;
+
+const LINE_0 = 25;
 
 helper() async {
   await null; // LINE_A.
@@ -20,13 +22,17 @@ helper() async {
 }
 
 testMain() async {
-  debugger();
+  debugger(); // LINE_0.
   print('mmmmm'); // LINE_D.
   await helper(); // LINE_E.
   print('z'); // LINE_F.
 }
 
 var tests = <IsolateTest>[
+  hasStoppedAtBreakpoint,
+  stoppedAtLine(LINE_0),
+  stepOver, // debugger.
+
   hasStoppedAtBreakpoint,
   stoppedAtLine(LINE_D),
   stepOver, // print.

pkg/vm_service/test/awaiter_async_stack_contents_2_test.dart

@@ -11,9 +11,11 @@ import 'package:vm_service/vm_service.dart';
 import 'common/service_test_common.dart';
 import 'common/test_helper.dart';
 
-const LINE_A = 28;
-const LINE_B = 34;
-const LINE_C = 38;
+const LINE_A = 30;
+const LINE_B = 36;
+const LINE_C = 40;
+
+const LINE_0 = 29;
 
 notCalled() async {
   await null;
@@ -24,7 +26,7 @@ notCalled() async {
 
 foobar() async {
   await null;
-  debugger();
+  debugger(); // LINE_0.
   print('foobar'); // LINE_A.
 }
 
@@ -39,6 +41,9 @@ testMain() async {
 }
 
 var tests = <IsolateTest>[
+  hasStoppedAtBreakpoint,
+  stoppedAtLine(LINE_0),
+  stepOver,
   hasStoppedAtBreakpoint,
   stoppedAtLine(LINE_A),
   (VmService service, IsolateRef isolate) async {