Improve line info accuracy in debugging

runtime/vm/debugger.cc

Index: runtime/vm/debugger.cc
===================================================================
--- runtime/vm/debugger.cc	(revision 16548)
+++ runtime/vm/debugger.cc	(working copy)
@@ -937,10 +937,11 @@
     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);
@@ -1351,10 +1352,12 @@
   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());
   }