Deoptimize closure functions in DeoptimizeWorld. This was causing

runtime/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 "include/dart_api.h"
 
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 931 matching lines @@
 // that inline the function that contains the newly created breakpoint.
 // We currently don't have this info so we deoptimize all functions.
 void Debugger::DeoptimizeWorld() {
   // Deoptimize all functions in stack activation frames.
   DeoptimizeAll();
   // Iterate over all classes, deoptimize functions.
   // TODO(hausner): Could possibly be combined with RemoveOptimizedCode()
   const ClassTable& class_table = *isolate_->class_table();
   Class& cls = Class::Handle();
   Array& functions = Array::Handle();
+  GrowableObjectArray& closures = GrowableObjectArray::Handle();
   Function& function = Function::Handle();
   intptr_t num_classes = class_table.NumCids();
   for (intptr_t i = 1; i < num_classes; i++) {
     if (class_table.HasValidClassAt(i)) {
       cls = class_table.At(i);
+
+      // Disable optimized functions.
       functions = cls.functions();
-      intptr_t num_functions = functions.IsNull() ? 0 : functions.Length();
-      for (intptr_t f = 0; f < num_functions; f++) {
-        function ^= functions.At(f);
-        ASSERT(!function.IsNull());
-        if (function.HasOptimizedCode()) {
-          function.SwitchToUnoptimizedCode();
+      if (!functions.IsNull()) {
+        intptr_t num_functions = functions.Length();
+        for (intptr_t pos = 0; pos < num_functions; pos++) {
+          function ^= functions.At(pos);
+          ASSERT(!function.IsNull());
+          if (function.HasOptimizedCode()) {
+            function.SwitchToUnoptimizedCode();
+          }
+          // Also disable any optimized implicit closure functions.
+          if (function.HasImplicitClosureFunction()) {
+            function = function.ImplicitClosureFunction();
+            if (function.HasOptimizedCode()) {
+              function.SwitchToUnoptimizedCode();
+            }
+          }
+        }
+      }
+
+      // Disable other optimized closure functions.
+      closures = cls.closures();
+      if (!closures.IsNull()) {
+        intptr_t num_closures = closures.Length();
+        for (intptr_t pos = 0; pos < num_closures; pos++) {
+          function ^= closures.At(pos);
+          ASSERT(!function.IsNull());
+          if (function.HasOptimizedCode()) {
+            function.SwitchToUnoptimizedCode();
+          }
         }
       }
     }
   }
 }
 
 
 void Debugger::InstrumentForStepping(const Function& target_function) {
   if (target_function.is_native()) {
     // Can't instrument native functions.
@@ skipping 1134 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart