Collect closure functions in isolate

runtime/vm/compiler.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/compiler.h"
 
 #include "vm/assembler.h"
 
 #include "vm/ast_printer.h"
 #include "vm/block_scheduler.h"
@@ skipping 1315 matching lines @@
         !func.is_abstract() &&
         !func.IsRedirectingFactory()) {
       error = CompileFunction(thread, func);
       if (!error.IsNull()) {
         return error.raw();
       }
       func.ClearICDataArray();
       func.ClearCode();
     }
   }
+
   // Inner functions get added to the closures array. As part of compilation
   // more closures can be added to the end of the array. Compile all the
   // closures until we have reached the end of the "worklist".
-  GrowableObjectArray& closures =
-      GrowableObjectArray::Handle(zone, cls.closures());
-  if (!closures.IsNull()) {
-    for (int i = 0; i < closures.Length(); i++) {
-      func ^= closures.At(i);
-      if (!func.HasCode()) {
-        error = CompileFunction(thread, func);
-        if (!error.IsNull()) {
-          return error.raw();
-        }
-        func.ClearICDataArray();
-        func.ClearCode();
+  const GrowableObjectArray& closures =
+      GrowableObjectArray::Handle(zone,
+          Isolate::Current()->object_store()->closure_functions());
+  for (int i = 0; i < closures.Length(); i++) {
+    func ^= closures.At(i);
+    if ((func.Owner() == cls.raw()) && !func.HasCode()) {
+      error = CompileFunction(thread, func);
+      if (!error.IsNull()) {
+        return error.raw();
       }
+      func.ClearICDataArray();
+      func.ClearCode();
     }
   }
   return error.raw();
 }
 
 
 void Compiler::CompileStaticInitializer(const Field& field) {
   ASSERT(field.is_static());
   if (field.HasPrecompiledInitializer()) {
     // TODO(rmacnak): Investigate why this happens for _enum_names.
@@ skipping 603 matching lines @@
       isolate->set_background_compiler(task);
       start_task = true;
     }
   }
   if (start_task) {
     Dart::thread_pool()->Run(isolate->background_compiler());
   }
 }
 
 }  // namespace dart