Make return statements single steppable

runtime/vm/debugger_api_impl_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "include/dart_debugger_api.h"
 #include "include/dart_mirrors_api.h"
 #include "platform/assert.h"
 #include "vm/dart_api_impl.h"
 #include "vm/thread.h"
 #include "vm/unit_test.h"
@@ skipping 629 matching lines @@
   breakpoint_hit = false;
   breakpoint_hit_counter = 0;
   Dart_Handle retval = Invoke("main");
   EXPECT_VALID(retval);
   EXPECT(Dart_IsInteger(retval));
   int64_t int_value = ToInt64(retval);
   EXPECT_EQ(2, int_value);
   EXPECT(breakpoint_hit == true);
 }
 
+static const char* step_into_expected_bpts[] = {
+    "main",
+      "foo",
+        "f1",
+      "foo",
+        "X.X.",
+        "X.X.",
+      "foo",
+        "X.kvmk",
+          "f2",
+        "X.kvmk",
+        "X.kvmk",
+      "foo",
+    "main"
+};
 
 void TestStepIntoHandler(Dart_IsolateId isolate_id,
                          intptr_t bp_id,
                          const Dart_CodeLocation& location) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);
-  const char* expected_bpts[] = {
-      "main",
-        "foo",
-          "f1",
-        "foo",
-          "X.X.",
-          "X.X.",
-        "foo",
-          "X.kvmk",
-            "f2",
-          "X.kvmk",
-          "X.kvmk",
-        "foo",
-      "main"
-  };
-  const intptr_t expected_bpts_length = ARRAY_SIZE(expected_bpts);
+  const intptr_t expected_bpts_length = ARRAY_SIZE(step_into_expected_bpts);
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   EXPECT_VALID(res);
   EXPECT(breakpoint_hit_counter < expected_bpts_length);
   Dart_ActivationFrame frame;
   res = Dart_GetActivationFrame(trace, 0, &frame);
   EXPECT_VALID(res);
   Dart_Handle func_name;
   res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL, NULL);
   EXPECT_VALID(res);
   EXPECT(Dart_IsString(func_name));
   const char* name_chars;
   Dart_StringToCString(func_name, &name_chars);
   if (breakpoint_hit_counter < expected_bpts_length) {
-    EXPECT_STREQ(expected_bpts[breakpoint_hit_counter], name_chars);
+    EXPECT_STREQ(step_into_expected_bpts[breakpoint_hit_counter], name_chars);
   }
   if (verbose) {
     OS::Print("  >> bpt nr %d: %s\n", breakpoint_hit_counter, name_chars);
   }
   breakpoint_hit = true;
   breakpoint_hit_counter++;
   Dart_SetStepInto();
 }
 
 
@@ skipping 23 matching lines @@
 
   SetBreakpointAtEntry("", "main");
   breakpoint_hit = false;
   breakpoint_hit_counter = 0;
   Dart_Handle retval = Invoke("main");
   EXPECT_VALID(retval);
   EXPECT(Dart_IsInteger(retval));
   int64_t int_value = ToInt64(retval);
   EXPECT_EQ(7, int_value);
   EXPECT(breakpoint_hit == true);
+  EXPECT(breakpoint_hit_counter == ARRAY_SIZE(step_into_expected_bpts));
 }
 
 
 static void StepIntoHandler(Dart_IsolateId isolate_id,
                             intptr_t bp_id,
                             const Dart_CodeLocation& location) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);
   if (verbose) {
     OS::Print(">>> Breakpoint nr. %d in %s <<<\n",
@@ skipping 1322 matching lines @@
 
   Dart_Handle list_type = Dart_InstanceGetType(list_access_test_obj);
   Dart_Handle super_type = Dart_GetSupertype(list_type);
   EXPECT(!Dart_IsError(super_type));
   super_type = Dart_GetSupertype(super_type);
   EXPECT(!Dart_IsError(super_type));
   EXPECT(super_type == Dart_Null());
 }
 
 }  // namespace dart