Improve line info accuracy in debugging

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 919 matching lines @@
   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 (bpt != NULL) {
       return bpt;
     }
 
     bpt = new CodeBreakpoint(func, best_fit_index);
     if (FLAG_verbose_debug) {
       OS::Print("Setting breakpoint in function '%s' "
-                "(%s:%"Pd") (PC %#"Px")\n",
+                "(%s:%"Pd") (Token %"Pd") (PC %#"Px")\n",
                 String::Handle(func.name()).ToCString(),
                 String::Handle(bpt->SourceUrl()).ToCString(),
                 bpt->LineNumber(),
+                bpt->token_pos(),
                 bpt->pc());
     }
     RegisterCodeBreakpoint(bpt);
     return bpt;
   }
   return NULL;
 }
 
 
 SourceBreakpoint* Debugger::SetBreakpoint(const Function& target_function,
@@ skipping 390 matching lines @@
   if (ignore_breakpoints_ || (stack_trace_ != NULL)) {
     return;
   }
   DebuggerStackTrace* stack_trace = CollectStackTrace();
   ASSERT(stack_trace->Length() > 0);
   ActivationFrame* top_frame = stack_trace->ActivationFrameAt(0);
   ASSERT(top_frame != NULL);
   CodeBreakpoint* bpt = GetCodeBreakpoint(top_frame->pc());
   ASSERT(bpt != NULL);
   if (FLAG_verbose_debug) {
-    OS::Print(">>> hit %s breakpoint at %s:%"Pd" (Address %#"Px")\n",
+    OS::Print(">>> hit %s breakpoint at %s:%"Pd" "
+              "(token %"Pd") (address %#"Px")\n",
               bpt->IsInternal() ? "internal" : "user",
               String::Handle(bpt->SourceUrl()).ToCString(),
               bpt->LineNumber(),
+              bpt->token_pos(),
               top_frame->pc());
   }
 
   if (!bpt->IsInternal()) {
     // This is a user-defined breakpoint so we call the breakpoint
     // callback even if it is on the same line as the previous breakpoint.
     last_bpt_line_ = -1;
   }
 
   bool notify_frontend =
@@ skipping 270 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart