Improve line info accuracy in debugging

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
@@ skipping 2322 matching lines @@
   Function& func = Function::Handle();
   func = LookupClosureFunction(token_pos);
   if (!func.IsNull()) {
     return func.raw();
   }
   Array& funcs = Array::Handle(functions());
   intptr_t len = funcs.Length();
   for (intptr_t i = 0; i < len; i++) {
     func ^= funcs.At(i);
     if ((func.token_pos() <= token_pos) &&
-        (token_pos < func.end_token_pos())) {
+        (token_pos <= func.end_token_pos())) {
       return func.raw();
     }
   }
   // No function found.
   return Function::null();
 }
 
 
 RawField* Class::LookupInstanceField(const String& name) const {
   ASSERT(is_finalized());
@@ skipping 3306 matching lines @@
     return Function::null();
   }
 
   // Determine token position at given line number.
   intptr_t first_token_pos, last_token_pos;
   script.TokenRangeAtLine(line_number, &first_token_pos, &last_token_pos);
   if (first_token_pos < 0) {
     // Script does not contain the given line number.
     return Function::null();
   }
-  return LookupFunctionInScript(script, first_token_pos);
+  Function& func = Function::Handle();
+  for (intptr_t pos = first_token_pos; pos <= last_token_pos; pos++) {
+    func = LookupFunctionInScript(script, pos);
+    if (!func.IsNull()) {
+      return func.raw();
+    }
+  }
+  return Function::null();
 }
 
 
 RawFunction* Library::LookupFunctionInScript(const Script& script,
                                              intptr_t token_pos) const {
   Class& cls = Class::Handle();
   Function& func = Function::Handle();
   ClassDictionaryIterator it(*this);
   while (it.HasNext()) {
     cls = it.GetNextClass();
@@ skipping 6815 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart