- Use simplified token location call where appropriate.

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/cpu.h"
@@ skipping 14837 matching lines @@
   JSONObject jsobj(stream);
 }
 
 
 static intptr_t PrintOneStacktrace(Isolate* isolate,
                                    GrowableArray<char*>* frame_strings,
                                    uword pc,
                                    const Function& function,
                                    const Code& code,
                                    intptr_t frame_index) {
-  const char* kFormat = "#%-6d %s (%s:%d:%d)\n";
+  const char* kFormatWithCol = "#%-6d %s (%s:%d:%d)\n";
+  const char* kFormatNoCol = "#%-6d %s (%s:%d)\n";
   const intptr_t token_pos = code.GetTokenIndexOfPC(pc);
   const Script& script = Script::Handle(isolate, function.script());
   const String& function_name =
       String::Handle(isolate, function.QualifiedUserVisibleName());
   const String& url = String::Handle(isolate, script.url());
   intptr_t line = -1;
   intptr_t column = -1;
   if (token_pos >= 0) {
-    script.GetTokenLocation(token_pos, &line, &column);
+    if (script.HasSource()) {
+      script.GetTokenLocation(token_pos, &line, &column);
+    } else {
+      script.GetTokenLocation(token_pos, &line, NULL);
+    }
   }
-  intptr_t len = OS::SNPrint(NULL, 0, kFormat,
-                             frame_index,
-                             function_name.ToCString(),
-                             url.ToCString(),
-                             line, column);
-  char* chars = isolate->current_zone()->Alloc<char>(len + 1);
-  OS::SNPrint(chars, (len + 1), kFormat,
-              frame_index,
-              function_name.ToCString(),
-              url.ToCString(),
-              line, column);
+  intptr_t len = 0;
+  char* chars = NULL;
+  if (column >= 0) {
+    len = OS::SNPrint(NULL, 0, kFormatWithCol,
+                      frame_index, function_name.ToCString(),
+                      url.ToCString(), line, column);
+    chars = isolate->current_zone()->Alloc<char>(len + 1);
+    OS::SNPrint(chars, (len + 1), kFormatWithCol,
+                frame_index,
+                function_name.ToCString(),
+                url.ToCString(), line, column);
+  } else {
+    len = OS::SNPrint(NULL, 0, kFormatNoCol,
+                      frame_index, function_name.ToCString(),
+                      url.ToCString(), line);
+    chars = isolate->current_zone()->Alloc<char>(len + 1);
+    OS::SNPrint(chars, (len + 1), kFormatNoCol,
+                frame_index, function_name.ToCString(),
+                url.ToCString(), line);
+  }
   frame_strings->Add(chars);
   return len;
 }
 
 
 const char* Stacktrace::ToCStringInternal(intptr_t frame_index) const {
   Isolate* isolate = Isolate::Current();
   Function& function = Function::Handle();
   Code& code = Code::Handle();
   // Iterate through the stack frames and create C string description
@@ skipping 232 matching lines @@
   return "_MirrorReference";
 }
 
 
 void MirrorReference::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
 }
 
 
 }  // namespace dart