VM: Fix source location in stack trace of async code.

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 20105 matching lines @@
 
 
 static intptr_t PrintOneStacktrace(Isolate* isolate,
                                    GrowableArray<char*>* frame_strings,
                                    uword pc,
                                    const Function& function,
                                    const Code& code,
                                    intptr_t frame_index) {
   const char* kFormatWithCol = "#%-6d %s (%s:%d:%d)\n";
   const char* kFormatNoCol = "#%-6d %s (%s:%d)\n";
+  const char* kFormatNoLine = "#%-6d %s (%s)\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) {

[Ivan Posva, 2015/02/04 21:15:29]

(token_pos > 0)

[Florian Schneider, 2015/02/05 09:55:43]

Done.

     if (script.HasSource()) {
       script.GetTokenLocation(token_pos, &line, &column);
     } else {
       script.GetTokenLocation(token_pos, &line, NULL);
     }
   }
   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 {
+  } else if (line >= 0) {

[hausner, 2015/02/04 18:34:13]

I believe line is always >= 0 (> 0 actually). GetTokenLocation() gets called for
even for token_pos == Scanner::kNoSourcePos (== 0) and sets the line number to
at least 1.

[Florian Schneider, 2015/02/05 09:55:42]

Oh yes, forgot to check that token_pos > 0 above.

     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);
+  } else {
+    len = OS::SNPrint(NULL, 0, kFormatNoLine,
+                      frame_index, function_name.ToCString(),
+                      url.ToCString());
+    chars = isolate->current_zone()->Alloc<char>(len + 1);
+    OS::SNPrint(chars, (len + 1), kFormatNoLine,
+                frame_index, function_name.ToCString(),
+                url.ToCString());
   }
   frame_strings->Add(chars);
   return len;
 }
 
 
 const char* Stacktrace::ToCStringInternal(intptr_t* frame_index,
                                           intptr_t max_frames) const {
   Isolate* isolate = Isolate::Current();
   Function& function = Function::Handle();
@@ skipping 396 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintJSONImpl(JSONStream* stream, bool ref) const {
   Instance::PrintJSONImpl(stream, ref);
 }
 
 
 }  // namespace dart