Address review comments.

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 10826 matching lines @@
 void Stacktrace::set_code_array(const Array& code_array) const {
   StorePointer(&raw_ptr()->code_array_, code_array.raw());
 }
 
 
 void Stacktrace::set_pc_offset_array(const Array& pc_offset_array) const {
   StorePointer(&raw_ptr()->pc_offset_array_, pc_offset_array.raw());
 }
 
 
-void Stacktrace::SetupStacktrace(intptr_t index,
-                                 const GrowableArray<uword>& frame_pcs) const {
-  Isolate* isolate = Isolate::Current();
-  ASSERT(isolate != NULL);
-  Code& code = Code::Handle(isolate, Code::null());
-  Smi& pc_offset = Smi::Handle(isolate, Smi::New(0));
-  const Array& code_array = Array::Handle(raw_ptr()->code_array_);
-  const Array& pc_offset_array = Array::Handle(raw_ptr()->pc_offset_array_);
-  for (intptr_t i = 0; i < frame_pcs.length(); i++) {
-    code ^= code_array.At(i);
-    pc_offset = Smi::New(frame_pcs[i] - code.EntryPoint());
-    pc_offset_array.SetAt((index + i), pc_offset);
-  }
-}
-
-
-RawStacktrace* Stacktrace::New(const GrowableArray<uword>& stack_frame_pcs,
-                               const GrowableObjectArray& func_list,
+RawStacktrace* Stacktrace::New(const GrowableObjectArray& func_list,
                                const GrowableObjectArray& code_list,
+                               const GrowableObjectArray& pc_offset_list,
                                Heap::Space space) {
   ASSERT(Isolate::Current()->object_store()->stacktrace_class() !=
          Class::null());
   Stacktrace& result = Stacktrace::Handle();
   {
     RawObject* raw = Object::Allocate(Stacktrace::kInstanceKind,
                                       Stacktrace::InstanceSize(),
                                       space);
     NoGCScope no_gc;
     result ^= raw;
   }
-  intptr_t length = stack_frame_pcs.length();
   // Create arrays for the function, code and pc_offset triplet for each frame.
   const Array& function_array = Array::Handle(Array::MakeArray(func_list));
   const Array& code_array = Array::Handle(Array::MakeArray(code_list));
-  const Array& pc_offset_array = Array::Handle(Array::New(length));
+  const Array& pc_offset_array =
+      Array::Handle(Array::MakeArray(pc_offset_list));
   result.set_function_array(function_array);
   result.set_code_array(code_array);
   result.set_pc_offset_array(pc_offset_array);
-  // Now populate the arrays with appropriate values from each frame.
-  result.SetupStacktrace(0, stack_frame_pcs);
   return result.raw();
 }
 
 
-void Stacktrace::Append(const GrowableArray<uword>& stack_frame_pcs,
-                        const GrowableObjectArray& func_list,
-                        const GrowableObjectArray& code_list) const {
+void Stacktrace::Append(const GrowableObjectArray& func_list,
+                        const GrowableObjectArray& code_list,
+                        const GrowableObjectArray& pc_offset_list) const {
   intptr_t old_length = Length();
-  intptr_t new_length = old_length + stack_frame_pcs.length();
-  ASSERT(stack_frame_pcs.length() == func_list.Length());
-  ASSERT(stack_frame_pcs.length() == code_list.Length());
+  intptr_t new_length = old_length + pc_offset_list.Length();
+  ASSERT(pc_offset_list.Length() == func_list.Length());
+  ASSERT(pc_offset_list.Length() == code_list.Length());
 
   // Grow the arrays for function, code and pc_offset triplet to accommodate
   // the new stack frames.
   Array& function_array = Array::Handle(raw_ptr()->function_array_);
   Array& code_array = Array::Handle(raw_ptr()->code_array_);
   Array& pc_offset_array = Array::Handle(raw_ptr()->pc_offset_array_);
   function_array = Array::Grow(function_array, new_length);
   code_array = Array::Grow(code_array, new_length);
   pc_offset_array = Array::Grow(pc_offset_array, new_length);
   set_function_array(function_array);
   set_code_array(code_array);
   set_pc_offset_array(pc_offset_array);
   // Now append the new function and code list to the existing arrays.
   intptr_t j = 0;
   Object& obj = Object::Handle();
   for (intptr_t i = old_length; i < new_length; i++, j++) {
     obj = func_list.At(j);
     function_array.SetAt(i, obj);
     obj = code_list.At(j);
     code_array.SetAt(i, obj);
+    obj = pc_offset_list.At(j);
+    pc_offset_array.SetAt(i, obj);
   }
-  // Now populate the arrays with appropriate values from each new frame.
-  SetupStacktrace(old_length, stack_frame_pcs);
 }
 
 
 const char* Stacktrace::ToCStringInternal(bool verbose) const {
   Function& function = Function::Handle();
   Code& code = Code::Handle();
   Class& function_class = Class::Handle();
   Script& script = Script::Handle();
   String& function_name = String::Handle();
   String& class_name = String::Handle();
@@ skipping 154 matching lines @@
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart