Fix breakpoint location

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 "vm/code_index_table.h"
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
@@ skipping 523 matching lines @@
 }
 
 
 CodeBreakpoint* Debugger::MakeCodeBreakpoint(const Function& func,
                                              intptr_t token_index) {
   ASSERT(func.HasCode());
   ASSERT(!func.HasOptimizedCode());
   Code& code = Code::Handle(func.unoptimized_code());
   ASSERT(!code.IsNull());
   PcDescriptors& desc = PcDescriptors::Handle(code.pc_descriptors());
+  intptr_t best_fit_index = -1;
+  intptr_t best_fit = INTPTR_MAX;
   for (int i = 0; i < desc.Length(); i++) {
-    if (desc.TokenIndex(i) < token_index) {
+    intptr_t desc_token_index = desc.TokenIndex(i);
+    if (desc_token_index < token_index) {

[srdjan, 2012/03/14 22:47:43]

You are searching for closest token after 'token_index', why not for closest
token ? -> abs(desc_token_index - token_index).

You could also stop if best_fit == 0.

[hausner, 2012/03/14 23:10:25]

The token index just before the requested index location is probably on the
previous line, not the one that was requested by the user. 

Yes, I could stop if the match is perfect, but that is almost never going to
happen. The token_index that is passed in represents the first token on a given
source line. That token is probably never a function call. So checking that
additional condition will cost more than it saves.

       continue;
     }
-    CodeBreakpoint* bpt = GetCodeBreakpoint(desc.PC(i));
+    PcDescriptors::Kind kind = desc.DescriptorKind(i);
+    if ((kind == PcDescriptors::kIcCall) ||
+        (kind == PcDescriptors::kFuncCall) ||
+        (kind == PcDescriptors::kReturn)) {
+      if ((desc_token_index - token_index) < best_fit) {
+        best_fit = desc_token_index - token_index;
+        ASSERT(best_fit >= 0);
+        best_fit_index = i;
+      }
+    }
+  }
+  if (best_fit_index >= 0) {
+    CodeBreakpoint* bpt = GetCodeBreakpoint(desc.PC(best_fit_index));
     // We should only ever have one code breakpoint at the same address.
     // If we find an existing breakpoint, it must be an internal one which
     // is used for stepping.
     if (bpt != NULL) {
       ASSERT(bpt->src_bpt() == NULL);
       return bpt;
     }
 
-    PcDescriptors::Kind kind = desc.DescriptorKind(i);
-    if ((kind == PcDescriptors::kIcCall) ||
-        (kind == PcDescriptors::kFuncCall) ||
-        (kind == PcDescriptors::kReturn)) {
-      bpt = new CodeBreakpoint(func, i);
-      if (verbose) {
-        OS::Print("Setting breakpoint in function '%s' (%s:%d)  (PC %p)\n",
-                  String::Handle(func.name()).ToCString(),
-                  String::Handle(bpt->SourceUrl()).ToCString(),
-                  bpt->LineNumber(),
-                  bpt->pc());
-      }
-      RegisterCodeBreakpoint(bpt);
-      return bpt;
+    bpt = new CodeBreakpoint(func, best_fit_index);
+    if (verbose) {
+      OS::Print("Setting breakpoint in function '%s' (%s:%d) (PC %p)\n",
+                String::Handle(func.name()).ToCString(),
+                String::Handle(bpt->SourceUrl()).ToCString(),
+                bpt->LineNumber(),
+                bpt->pc());
     }
+    RegisterCodeBreakpoint(bpt);
+    return bpt;
   }
   return NULL;
 }
 
 
 SourceBreakpoint* Debugger::SetBreakpoint(const Function& target_function,
                                           intptr_t token_index) {
   if ((token_index < target_function.token_index()) ||
       (target_function.end_token_index() <= token_index)) {
     // The given token position is not within the target function.
@@ skipping 458 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart