Debugging in kernel shaping up.

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/become.h"
@@ skipping 8848 matching lines @@
   if (kind() == RawScript::kKernelTag) {
     const Array& line_starts_array = Array::Handle(line_starts());
     if (line_starts_array.IsNull()) {
       // Scripts in the AOT snapshot do not have a line starts array.
       // A well-formed line number array has a leading null.
       info.Add(line_separator);  // New line.
       return info.raw();
     }
     intptr_t line_count = line_starts_array.Length();
     ASSERT(line_count > 0);
+    const Array& debug_positions_array = Array::Handle(debug_positions());
+    intptr_t token_count = debug_positions_array.Length();
+    int token_index = 0;
 
-    for (int i = 0; i < line_count; i++) {
-      info.Add(line_separator);  // New line.
-      value = Smi::New(i + 1);
-      info.Add(value);  // Line number.
-      value ^= line_starts_array.At(i);
-      info.Add(value);  // Token position.
-      value = Smi::New(1);
-      info.Add(value);  // Column.
+    for (int line_index = 0; line_index < line_count; ++line_index) {
+      value ^= line_starts_array.At(line_index);
+      intptr_t start = value.Value();
+      // Output the rest of the tokens if we have no next line.
+      intptr_t end = TokenPosition::kMaxSourcePos;
+      if (line_index + 1 < line_count) {
+        value ^= line_starts_array.At(line_index + 1);
+        end = value.Value();
+      }
+      bool first = true;
+      while (token_index < token_count) {
+        value ^= debug_positions_array.At(token_index);
+        intptr_t debug_position = value.Value();
+        if (debug_position >= end) break;
+
+        if (first) {
+          info.Add(line_separator);          // New line.
+          value = Smi::New(line_index + 1);  // Line number.
+          info.Add(value);
+          first = false;
+        }
+
+        value ^= debug_positions_array.At(token_index);
+        info.Add(value);                               // Token position.
+        value = Smi::New(debug_position - start + 1);  // Column.
+        info.Add(value);
+        ++token_index;
+      }
     }
     return info.raw();
   }
 
   const TokenStream& tkns = TokenStream::Handle(zone, tokens());
   String& tokenValue = String::Handle(zone);
   ASSERT(!tkns.IsNull());
   TokenStream::Iterator tkit(zone, tkns, TokenPosition::kMinSource,
                              TokenStream::Iterator::kAllTokens);
   int current_line = -1;
@@ skipping 100 matching lines @@
 
 void Script::set_source(const String& value) const {
   StorePointer(&raw_ptr()->source_, value.raw());
 }
 
 void Script::set_line_starts(const Array& value) const {
   StorePointer(&raw_ptr()->line_starts_, value.raw());
 }
 
 
+void Script::set_debug_positions(const Array& value) const {
+  StorePointer(&raw_ptr()->debug_positions_, value.raw());
+}
+
+void Script::set_yield_positions(const Array& value) const {
+  StorePointer(&raw_ptr()->yield_positions_, value.raw());
+}
+
 void Script::set_kind(RawScript::Kind value) const {
   StoreNonPointer(&raw_ptr()->kind_, value);
 }
 
 
 void Script::set_load_timestamp(int64_t value) const {
   StoreNonPointer(&raw_ptr()->load_timestamp_, value);
 }
 
 
@@ skipping 70 matching lines @@
       } else {
         min = midpoint;
       }
     }
     *line = min + 1;
     smi ^= line_starts_array.At(min);
     if (column != NULL) {
       *column = offset - smi.Value() + 1;
     }
     if (token_len != NULL) {
+      // We don't explicitly save this data.
+      // TODO(jensj): Load the source and attempt to find it from there.
       *token_len = 1;
     }
     return;
   }
 
   const TokenStream& tkns = TokenStream::Handle(zone, tokens());
   if (tkns.IsNull()) {
     ASSERT((Dart::vm_snapshot_kind() == Snapshot::kAppAOT));
     *line = -1;
     if (column != NULL) {
@@ skipping 13954 matching lines @@
   return UserTag::null();
 }
 
 
 const char* UserTag::ToCString() const {
   const String& tag_label = String::Handle(label());
   return tag_label.ToCString();
 }
 
 }  // namespace dart