Use GrowableObjectArray in the debugger instance/static field lists.

vm/debugger.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/debugger.h"
 
 #include "vm/code_index_table.h"
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
@@ skipping 164 matching lines @@
   return line_number_;
 }
 
 
 void ActivationFrame::GetDescIndices() {
   if (var_descriptors_ == NULL) {
     ASSERT(!DartFunction().HasOptimizedCode());
     const Code& code = Code::Handle(DartFunction().unoptimized_code());
     var_descriptors_ =
         &LocalVarDescriptors::ZoneHandle(code.var_descriptors());
+    // TODO(Hausner): Consider replacing this GrowableArray.
     GrowableArray<String*> var_names(8);
     intptr_t activation_token_pos = TokenIndex();
     intptr_t var_desc_len = var_descriptors_->Length();
     for (int cur_idx = 0; cur_idx < var_desc_len; cur_idx++) {
       ASSERT(var_names.length() == desc_indices_.length());
       intptr_t scope_id, begin_pos, end_pos;
       var_descriptors_->GetScopeInfo(cur_idx, &scope_id, &begin_pos, &end_pos);
       if ((begin_pos <= activation_token_pos) &&
           (activation_token_pos <= end_pos)) {
         // The current variable is textually in scope. Now check whether
@@ skipping 457 matching lines @@
     if (verbose) {
       OS::Print("No executable code at line %d in '%s'\n",
                 line_number, script_url.ToCString());
     }
     return NULL;
   }
   return SetBreakpoint(func, token_index_at_line);
 }
 
 
-static RawArray* MakeNameValueList(const GrowableArray<Object*>& pairs) {
-  int pairs_len = pairs.length();
-  ASSERT(pairs_len % 2 == 0);
-  const Array& list = Array::Handle(Array::New(pairs_len));
-  for (int i = 0; i < pairs_len; i++) {
-    list.SetAt(i, *pairs[i]);
-  }
-  return list.raw();
-}
-
-
 // TODO(hausner): Merge some of this functionality with the code in
 // dart_api_impl.cc.
 RawObject* Debugger::GetInstanceField(const Class& cls,
                                       const String& field_name,
                                       const Instance& object) {
   const Function& getter_func =
       Function::Handle(cls.LookupGetterFunction(field_name));
   ASSERT(!getter_func.IsNull());
 
   Object& result = Object::Handle();
@@ skipping 32 matching lines @@
   }
   isolate_->set_long_jump_base(base);
   return result.raw();
 }
 
 
 RawArray* Debugger::GetInstanceFields(const Instance& obj) {
   Class& cls = Class::Handle(obj.clazz());
   Array& fields = Array::Handle();
   Field& field = Field::Handle();
-  GrowableArray<Object*> field_list(8);
+  const GrowableObjectArray& field_list =
+      GrowableObjectArray::Handle(GrowableObjectArray::New(8));
+  String& field_name = String::Handle();
+  Object& field_value = Object::Handle();
   // Iterate over fields in class hierarchy to count all instance fields.
   while (!cls.IsNull()) {
     fields = cls.fields();
     for (int i = 0; i < fields.Length(); i++) {
       field ^= fields.At(i);
       if (!field.is_static()) {
-        String& field_name = String::Handle(field.name());
-        field_list.Add(&field_name);
-        Object& field_value = Object::Handle();
+        field_name = field.name();
+        field_list.Add(field_name);
         field_value = GetInstanceField(cls, field_name, obj);
-        field_list.Add(&field_value);
+        field_list.Add(field_value);
       }
     }
     cls = cls.SuperClass();
   }
-  return MakeNameValueList(field_list);
+  return Array::MakeArray(field_list);
 }
 
 
 RawArray* Debugger::GetStaticFields(const Class& cls) {
-  GrowableArray<Object*> field_list(8);
+  const GrowableObjectArray& field_list =
+      GrowableObjectArray::Handle(GrowableObjectArray::New(8));
   Array& fields = Array::Handle(cls.fields());
   Field& field = Field::Handle();
+  String& field_name = String::Handle();
+  Object& field_value = Object::Handle();
   for (int i = 0; i < fields.Length(); i++) {
     field ^= fields.At(i);
     if (field.is_static()) {
-      String& field_name = String::Handle(field.name());
-      Object& field_value = Object::Handle(GetStaticField(cls, field_name));
-      field_list.Add(&field_name);
-      field_list.Add(&field_value);
+      field_name = field.name();
+      field_value = GetStaticField(cls, field_name);
+      field_list.Add(field_name);
+      field_list.Add(field_value);
     }
   }
-  return MakeNameValueList(field_list);
+  return Array::MakeArray(field_list);
 }
 
 
 void Debugger::VisitObjectPointers(ObjectPointerVisitor* visitor) {
   ASSERT(visitor != NULL);
   SourceBreakpoint* bpt = src_breakpoints_;
   while (bpt != NULL) {
     bpt->VisitObjectPointers(visitor);
     bpt = bpt->next();
   }
@@ skipping 246 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart