Revert "Merge of source position information from kernel-sdk."

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 8764 matching lines @@
     case RawScript::kScriptTag:
       return "script";
     case RawScript::kLibraryTag:
       return "library";
     case RawScript::kSourceTag:
       return "source";
     case RawScript::kPatchTag:
       return "patch";
     case RawScript::kEvaluateTag:
       return "evaluate";
-    case RawScript::kKernelTag:
-      return "kernel";
     default:
       UNIMPLEMENTED();
   }
   UNREACHABLE();
   return NULL;
 }
 
 
 void Script::set_url(const String& value) const {
   StorePointer(&raw_ptr()->url_, value.raw());
 }
 
 
 void Script::set_resolved_url(const String& value) const {
   StorePointer(&raw_ptr()->resolved_url_, value.raw());
 }
 
 
 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_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 30 matching lines @@
   StoreNonPointer(&raw_ptr()->col_offset_, col_offset);
 }
 
 
 void Script::GetTokenLocation(TokenPosition token_pos,
                               intptr_t* line,
                               intptr_t* column,
                               intptr_t* token_len) const {
   ASSERT(line != NULL);
   Zone* zone = Thread::Current()->zone();
-
-  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.
-      *line = -1;
-      if (column != NULL) {
-        *column = -1;
-      }
-      if (token_len != NULL) {
-        *token_len = 1;
-      }
-      return;
-    }
-    ASSERT(line_starts_array.Length() > 0);
-    intptr_t offset = token_pos.value();
-    int min = 0;
-    int max = line_starts_array.Length() - 1;
-
-    // Binary search to find the line containing this offset.
-    Smi& smi = Smi::Handle();
-    while (min < max) {
-      int midpoint = (max - min + 1) / 2 + min;
-
-      smi ^= line_starts_array.At(midpoint);
-      if (smi.Value() > offset) {
-        max = midpoint - 1;
-      } else {
-        min = midpoint;
-      }
-    }
-    *line = min + 1;
-    if (column != NULL) {
-      smi ^= line_starts_array.At(min);
-      *column = offset - smi.Value() + 1;
-    }
-    if (token_len != NULL) {
-      *token_len = 1;
-    }
-    return;
-  }
-
   const TokenStream& tkns = TokenStream::Handle(zone, tokens());
   if (tkns.IsNull()) {
-    ASSERT((Dart::snapshot_kind() == Snapshot::kAppNoJIT));
+    ASSERT((Dart::snapshot_kind() == Snapshot::kAppNoJIT) ||
+           (url() == Symbols::KernelScriptUri().raw()));
     *line = -1;
     if (column != NULL) {
       *column = -1;
     }
     if (token_len != NULL) {
       *token_len = 1;
     }
     return;
   }
-  if (!HasSource()) {
+  if (column == NULL) {
     TokenStream::Iterator tkit(zone, tkns, TokenPosition::kMinSource,
                                TokenStream::Iterator::kAllTokens);
     intptr_t cur_line = line_offset() + 1;
     while ((tkit.CurrentPosition() < token_pos) &&
            (tkit.CurrentTokenKind() != Token::kEOS)) {
       if (tkit.CurrentTokenKind() == Token::kNEWLINE) {
         cur_line++;
       }
       tkit.Advance();
     }
     *line = cur_line;
   } else {
     const String& src = String::Handle(zone, Source());
     intptr_t src_pos = tkns.ComputeSourcePosition(token_pos);
     Scanner scanner(src, Symbols::Empty());
     scanner.ScanTo(src_pos);
     intptr_t relative_line = scanner.CurrentPosition().line;
     *line = relative_line + line_offset();
-    if (column != NULL) {
-      *column = scanner.CurrentPosition().column;
-    }
+    *column = scanner.CurrentPosition().column;
     if (token_len != NULL) {
       if (scanner.current_token().literal != NULL) {
         *token_len = scanner.current_token().literal->Length();
       } else {
         *token_len = 1;
       }
     }
     // On the first line of the script we must add the column offset.
-    if (column != NULL && relative_line == 1) {
+    if (relative_line == 1) {
       *column += col_offset();
     }
   }
 }
 
 
 void Script::TokenRangeAtLine(intptr_t line_number,
                               TokenPosition* first_token_index,
                               TokenPosition* last_token_index) const {
   ASSERT(first_token_index != NULL && last_token_index != NULL);
@@ skipping 13396 matching lines @@
                                    intptr_t frame_index) {
   const TokenPosition token_pos = code.GetTokenIndexOfPC(pc);
   const Script& script = Script::Handle(zone, function.script());
   const String& function_name =
       String::Handle(zone, function.QualifiedUserVisibleName());
   const String& url = String::Handle(
       zone, script.IsNull() ? String::New("Kernel") : script.url());
   intptr_t line = -1;
   intptr_t column = -1;
   if (!script.IsNull() && token_pos.IsReal()) {
-    script.GetTokenLocation(token_pos, &line, &column);
+    if (script.HasSource()) {
+      script.GetTokenLocation(token_pos, &line, &column);
+    } else {
+      script.GetTokenLocation(token_pos, &line, NULL);
+    }
   }
   char* chars = NULL;
   if (column >= 0) {
     chars =
         OS::SCreate(zone, "#%-6" Pd " %s (%s:%" Pd ":%" Pd ")\n", frame_index,
                     function_name.ToCString(), url.ToCString(), line, column);
   } else if (line >= 0) {
     chars = OS::SCreate(zone, "#%-6" Pd " %s (%s:%" Pd ")\n", frame_index,
                         function_name.ToCString(), url.ToCString(), line);
   } else {
@@ skipping 389 matching lines @@
   return UserTag::null();
 }
 
 
 const char* UserTag::ToCString() const {
   const String& tag_label = String::Handle(label());
   return tag_label.ToCString();
 }
 
 }  // namespace dart