Fix stack frame index numbers for full stack traces

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 12971 matching lines @@
                                     const Array& code_array,
                                     const Array& pc_offset_array) const {
   StorePointer(&raw_ptr()->catch_func_array_, func_array.raw());
   StorePointer(&raw_ptr()->catch_code_array_, code_array.raw());
   StorePointer(&raw_ptr()->catch_pc_offset_array_, pc_offset_array.raw());
 }
 
 
 RawString* Stacktrace::FullStacktrace() const {
   const Array& func_array = Array::Handle(raw_ptr()->catch_func_array_);
-  if (!func_array.IsNull() &&
-      func_array.raw() != Object::empty_array().raw()) {
+  if (!func_array.IsNull() && (func_array.Length() > 0)) {
     const Array& code_array = Array::Handle(raw_ptr()->catch_code_array_);
     const Array& pc_offset_array =
         Array::Handle(raw_ptr()->catch_pc_offset_array_);
     const Stacktrace& catch_trace = Stacktrace::Handle(
         Stacktrace::New(func_array, code_array, pc_offset_array));
+    intptr_t idx = Length();
     const String& trace =
-        String::Handle(String::New(catch_trace.ToCStringInternal()));
+        String::Handle(String::New(catch_trace.ToCStringInternal(idx)));
     const String& throw_trace =
-        String::Handle(String::New(ToCStringInternal()));
+        String::Handle(String::New(ToCStringInternal(0)));
     return String::Concat(throw_trace, trace);
   }
-  return String::New(ToCStringInternal());
+  return String::New(ToCStringInternal(0));
 }
 
 
 const char* Stacktrace::ToCString() const {
   const String& trace = String::Handle(FullStacktrace());
   return trace.ToCString();
 }
 
 
-const char* Stacktrace::ToCStringInternal() const {
+const char* Stacktrace::ToCStringInternal(intptr_t frame_index) const {
   Isolate* isolate = Isolate::Current();
   Function& function = Function::Handle();
   Code& code = Code::Handle();
   Script& script = Script::Handle();
   String& function_name = String::Handle();
   String& url = String::Handle();
 
   // Iterate through the stack frames and create C string description
   // for each frame.
   intptr_t total_len = 0;
@@ skipping 19 matching lines @@
     intptr_t token_pos = code.GetTokenIndexOfPC(pc);
     script = function.script();
     function_name = function.QualifiedUserVisibleName();
     url = script.url();
     intptr_t line = -1;
     intptr_t column = -1;
     if (token_pos >= 0) {
       script.GetTokenLocation(token_pos, &line, &column);
     }
     intptr_t len = OS::SNPrint(NULL, 0, kFormat,
-                               i,
+                               (frame_index + i),
                                function_name.ToCString(),
                                url.ToCString(),
                                line, column);
     total_len += len;
     chars = isolate->current_zone()->Alloc<char>(len + 1);
     OS::SNPrint(chars, (len + 1), kFormat,
-                i,
+                (frame_index + i),
                 function_name.ToCString(),
                 url.ToCString(),
                 line, column);
     frame_strings.Add(chars);
   }
 
   // Now concatentate the frame descriptions into a single C string.
   chars = isolate->current_zone()->Alloc<char>(total_len + 1);
   intptr_t index = 0;
   for (intptr_t i = 0; i < frame_strings.length(); i++) {
@@ skipping 117 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart