Iterate over PcDescriptors only via iterators, not via an index. (preparation for more compression …

runtime/vm/coverage.cc

 // Copyright (c) 2013, 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/coverage.h"
 
 #include "include/dart_api.h"
 
 #include "vm/compiler.h"
 #include "vm/isolate.h"
@@ skipping 67 matching lines @@
       new(isolate) ZoneGrowableArray<const ICData*>();
   function.RestoreICDataMap(ic_data_array);
   const Code& code = Code::Handle(function.unoptimized_code());
   const PcDescriptors& descriptors = PcDescriptors::Handle(
       code.pc_descriptors());
 
   const intptr_t begin_pos = function.token_pos();
   const intptr_t end_pos = function.end_token_pos();
   intptr_t last_line = -1;
   intptr_t last_count = 0;
-  for (int j = 0; j < descriptors.Length(); j++) {
+  PcDescriptors::Iterator iter(descriptors);
+  while (iter.HasNext()) {
     HANDLESCOPE(isolate);
-    PcDescriptors::Kind kind = descriptors.DescriptorKind(j);
+    const RawPcDescriptors::PcDescriptorRec& rec = iter.Next();
+    RawPcDescriptors::Kind kind = rec.kind();
     // Only IC based calls have counting.
-    if ((kind == PcDescriptors::kIcCall) ||
-        (kind == PcDescriptors::kUnoptStaticCall)) {
-      intptr_t deopt_id = descriptors.DeoptId(j);
+    if ((kind == RawPcDescriptors::kIcCall) ||
+        (kind == RawPcDescriptors::kUnoptStaticCall)) {
+      intptr_t deopt_id = rec.deopt_id;
       const ICData* ic_data= (*ic_data_array)[deopt_id];
       if (!ic_data->IsNull()) {
-        intptr_t token_pos = descriptors.TokenPos(j);
+        intptr_t token_pos = rec.token_pos;
         // Filter out descriptors that do not map to tokens in the source code.
         if (token_pos < begin_pos ||
             token_pos > end_pos) {
           continue;
         }
         intptr_t line = pos_to_line[token_pos];
 #if defined(DEBUG)
         const Script& script = Script::Handle(function.script());
         intptr_t test_line = -1;
         script.GetTokenLocation(token_pos, &test_line, NULL);
@@ skipping 199 matching lines @@
         cls = it.GetNextClass();
         ASSERT(!cls.IsNull());
         PrintClass(cls, jsarr, Script::Handle());
       }
     }
   }
 }
 
 
 }  // namespace dart