Replace linked list of loaded libraries

runtime/vm/debugger_api_impl.cc

Index: runtime/vm/debugger_api_impl.cc
===================================================================
--- runtime/vm/debugger_api_impl.cc	(revision 7914)
+++ runtime/vm/debugger_api_impl.cc	(working copy)
@@ -498,24 +498,19 @@
   ASSERT(isolate != NULL);
   DARTSCOPE(isolate);
 
-  // Find out how many libraries are loaded in this isolate.
-  int num_libs = 0;
-  Library &lib = Library::Handle();
-  lib = isolate->object_store()->registered_libraries();
-  while (!lib.IsNull()) {
-    num_libs++;
-    lib = lib.next_registered();
-  }
+  const GrowableObjectArray& libs =
+      GrowableObjectArray::Handle(isolate->object_store()->libraries());
+  int num_libs = libs.Length();
 
   // Create new list and populate with the url of loaded libraries.
-  const Array& library_list = Array::Handle(Array::New(num_libs));
-  lib = isolate->object_store()->registered_libraries();
+  Library &lib = Library::Handle();
   String& lib_url = String::Handle();
+  const Array& library_list = Array::Handle(Array::New(num_libs));

[srdjan, 2012/05/23 17:35:18]

library_url_list ?

[hausner, 2012/05/23 20:27:14]

Done.

   for (int i = 0; i < num_libs; i++) {
+    lib ^= libs.At(i);
     ASSERT(!lib.IsNull());
     lib_url = lib.url();
     library_list.SetAt(i, lib_url);
-    lib = lib.next_registered();
   }
   return Api::NewHandle(isolate, library_list.raw());
 }