Make return statements single steppable

runtime/vm/intermediate_language_arm.cc

Index: runtime/vm/intermediate_language_arm.cc
===================================================================
--- runtime/vm/intermediate_language_arm.cc	(revision 31428)
+++ runtime/vm/intermediate_language_arm.cc	(working copy)
@@ -99,13 +99,6 @@
 #endif
   __ LeaveDartFrame();
   __ Ret();
-
-  // No need to generate NOP instructions so that the debugger can patch the
-  // return pattern (3 instructions) with a call to the debug stub (also 3
-  // instructions).
-  compiler->AddCurrentDescriptor(PcDescriptors::kReturn,
-                                 Isolate::kNoDeoptId,
-                                 token_pos());
 }
 
 
@@ -735,6 +728,27 @@
 }
 
 
+LocationSummary* DebugStepCheckInstr::MakeLocationSummary(bool opt) const {
+  const intptr_t kNumInputs = 0;
+  const intptr_t kNumTemps = 0;
+  LocationSummary* locs =
+      new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kCall);
+  return locs;
+}
+
+
+void DebugStepCheckInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
+  if (!compiler->is_optimizing()) {
+    const ExternalLabel label("debug_step_check",
+                              StubCode::DebugStepCheckEntryPoint());
+    compiler->GenerateCall(token_pos(),
+                           &label,
+                           PcDescriptors::kReturn,
+                           locs());
+  }
+}
+
+
 void StringFromCharCodeInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register char_code = locs()->in(0).reg();
   Register result = locs()->out().reg();