Collect closure functions in isolate

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 173 matching lines @@
       }
       if (!filter->ShouldOutputCoverageFor(lib, script, cls, function)) {
         i++;
         continue;
       }
       CompileAndAdd(function, hits_or_sites, pos_to_line, as_call_sites);
       i++;
     }
   }
 
-  GrowableObjectArray& closures =
-      GrowableObjectArray::Handle(cls.closures());
-  if (!closures.IsNull()) {
-    i = 0;
-    pos_to_line.Clear();
-    // We need to keep rechecking the length of the closures array, as handling
-    // a closure potentially adds new entries to the end.
+  const GrowableObjectArray& closures = GrowableObjectArray::Handle(
+      thread->isolate()->object_store()->closure_functions());
+  pos_to_line.Clear();
+  // We need to keep rechecking the length of the closures array, as handling
+  // a closure potentially adds new entries to the end.
+  i = 0;
+  while (i < closures.Length()) {
+    HANDLESCOPE(thread);
+    function ^= closures.At(i);
+    if (function.Owner() != cls.raw()) {
+      i++;
+      continue;
+    }
+    script = function.script();
+    saved_url = script.url();
+    if (!filter->ShouldOutputCoverageFor(lib, script, cls, function)) {
+      i++;
+      continue;
+    }
+    ComputeTokenPosToLineNumberMap(script, &pos_to_line);
+    JSONObject jsobj(&jsarr);
+    jsobj.AddProperty("source", saved_url.ToCString());
+    jsobj.AddProperty("script", script);
+    JSONArray hits_or_sites(&jsobj, as_call_sites ? "callSites" : "hits");
+
+    // We stay within this loop while we are seeing functions from the same
+    // source URI.
     while (i < closures.Length()) {
-      HANDLESCOPE(thread);
       function ^= closures.At(i);
       script = function.script();
-      saved_url = script.url();
-      if (!filter->ShouldOutputCoverageFor(lib, script, cls, function)) {
-        i++;
-        continue;
+      url = script.url();
+      if (!url.Equals(saved_url)) {
+        pos_to_line.Clear();
+        break;
       }
-      ComputeTokenPosToLineNumberMap(script, &pos_to_line);
-      JSONObject jsobj(&jsarr);
-      jsobj.AddProperty("source", saved_url.ToCString());
-      jsobj.AddProperty("script", script);
-      JSONArray hits_or_sites(&jsobj, as_call_sites ? "callSites" : "hits");
-
-      // We stay within this loop while we are seeing functions from the same
-      // source URI.
-      while (i < closures.Length()) {
-        function ^= closures.At(i);
-        script = function.script();
-        url = script.url();
-        if (!url.Equals(saved_url)) {
-          pos_to_line.Clear();
-          break;
-        }
-        CompileAndAdd(function, hits_or_sites, pos_to_line, as_call_sites);
-        i++;
-      }
+      CompileAndAdd(function, hits_or_sites, pos_to_line, as_call_sites);
+      i++;
     }
   }
 }
 
 
 void CodeCoverage::Write(Thread* thread) {
   if (FLAG_coverage_dir == NULL) {
     return;
   }
 
@@ skipping 45 matching lines @@
         cls = it.GetNextClass();
         ASSERT(!cls.IsNull());
         PrintClass(lib, cls, jsarr, filter, as_call_sites);
       }
     }
   }
 }
 
 
 }  // namespace dart