Fiddle with breakpoint resolution

runtime/vm/debugger.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 "vm/debugger.h"
 
 #include "include/dart_api.h"
 
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 1527 matching lines @@
   if (lowest_pc_index >= 0) {
     // We found the pc descriptor that has the lowest execution address.
     // This is the first possible breakpoint after the requested token
     // position. We use this instead of the nearest PC descriptor
     // measured in token index distance.
     best_fit_index = lowest_pc_index;
   }
   if (best_fit_index >= 0) {
     return desc.TokenPos(best_fit_index);
   }
+  // We didn't find a safe point in the given token range. Try and find
+  // a safe point in the remaining source code of the function.
+  if (last_token_pos < func.end_token_pos()) {

[Ivan Posva, 2014/05/02 04:58:56]

This looks a bit strange to me. First we start by determining the extent of the
token positions on a line (in SetBreakpointAtLine) and then we allow setting of
a breakpoint anywhere within the function here. Let's discuss in person.

+    return ResolveBreakpointPos(func, last_token_pos, func.end_token_pos());
+  }
   return -1;
 }
 
 
 void Debugger::MakeCodeBreakpointAt(const Function& func,
                                     SourceBreakpoint* bpt) {
   ASSERT((bpt != NULL) && bpt->IsResolved());
   ASSERT(!func.HasOptimizedCode());
   Code& code = Code::Handle(func.unoptimized_code());
   ASSERT(!code.IsNull());
@@ skipping 970 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart