Cleanups. More mutator thread asserts.

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 794 matching lines @@
           if (Compiler::allow_recompilation()) {
             if (result != NULL) {
               // Background compilation: delay registering code until we are
               // in the MutatorThread.
               result->SetLeafClasses(thread->cha()->leaf_classes());
               result->SetGuardedFields(*flow_graph->guarded_fields());
               result->SetDeoptimizeDependentFields(
                   flow_graph->deoptimize_dependent_code());
             } else {
               for (intptr_t i = 0;
+                   i < flow_graph->deoptimize_dependent_code().length();
+                   i++) {
+                const Field* field = flow_graph->deoptimize_dependent_code()[i];
+                field->DeoptimizeDependentCode();
+              }
+              for (intptr_t i = 0;
                    i < thread->cha()->leaf_classes().length();
                    ++i) {
                 thread->cha()->leaf_classes()[i]->RegisterCHACode(code);
               }
               for (intptr_t i = 0;
                    i < flow_graph->guarded_fields()->length();
                    i++) {
                 const Field* field = (*flow_graph->guarded_fields())[i];
                 field->RegisterDependentCode(code);
               }
-              for (intptr_t i = 0;
-                   i < flow_graph->deoptimize_dependent_code().length();
-                   i++) {
-                const Field* field = flow_graph->deoptimize_dependent_code()[i];
-                field->DeoptimizeDependentCode();
-              }
             }
           }
         } else {  // not optimized.
           if (!Compiler::always_optimize() &&
               (function.ic_data_array() == Array::null())) {
             function.SaveICDataMap(
                 graph_compiler.deopt_id_to_ic_data(),
                 Array::Handle(zone, graph_compiler.edge_counters_array()));
           }
           function.set_unoptimized_code(code);
@@ skipping 972 matching lines @@
   }
 }
 
 
 // Use to first queue element to form the result element.
 void BackgroundCompiler::AddResult(const BackgroundCompilationResult& result) {
   ASSERT(!Thread::Current()->IsMutatorThread());
   MonitorLocker ml(queue_monitor_);
   // Reuse the input QueueElement to return the result.
   QueueElement* qelem = function_queue()->Remove();
-  if (result.IsValid()) {
-    qelem->SetFromResult(result);
-    result_queue()->Add(qelem);
-  }
+  // Always add result, even if it is invalid, since the queue element is
+  // deleted in the mutator thread and potential field based deoptimizations
+  // (carried in the result) still must be done.
+  qelem->SetFromResult(result);
+  result_queue()->Add(qelem);
 }
 
 
 void BackgroundCompiler::CompileOptimized(const Function& function) {
   ASSERT(Thread::Current()->IsMutatorThread());
   MonitorLocker ml(queue_monitor_);
   if (function_queue()->ContainsObj(function)) {
     return;
   }
   QueueElement* elem = new QueueElement(function);
   function_queue()->Add(elem);
   ml.Notify();
 }
 
 
 void BackgroundCompiler::InstallGeneratedCode() {
   ASSERT(Thread::Current()->IsMutatorThread());
   MonitorLocker ml(queue_monitor_);
   Function& function = Function::Handle();
   while (result_queue()->Peek() != NULL) {
     BackgroundCompilationResult result;
-    QueueElement* elem = result_queue()->Remove();
-    ASSERT(elem != NULL);
-    result.SetFromQElement(elem);
-    delete elem;
+    QueueElement* qelem = result_queue()->Remove();
+    ASSERT(qelem != NULL);
+    result.SetFromQElement(qelem);
+    delete qelem;
 
     const Code& code = result.result_code();
     function ^= code.owner();
+    Field& field = Field::Handle();
+    // Always execute necessary deoptimizations, even if the result is invalid.
+    for (intptr_t i = 0; i < result.deoptimize_dependent_fields().Length();
+         i++) {
+      field ^= result.deoptimize_dependent_fields().At(i);
+      field.DeoptimizeDependentCode();
+    }
     if (result.IsValid()) {
       function.InstallOptimizedCode(result.result_code(), false /* not OSR */);
       // Install leaf classes and fields dependencies.
       Class& cls = Class::Handle();
       for (intptr_t i = 0; i < result.leaf_classes().Length(); i++) {
         cls ^= result.leaf_classes().At(i);
         cls.RegisterCHACode(code);
       }
-      Field& field = Field::Handle();
       for (intptr_t i = 0; i < result.guarded_fields().Length(); i++) {
         field ^= result.guarded_fields().At(i);
         field.RegisterDependentCode(code);
       }
-      for (intptr_t i = 0; i < result.deoptimize_dependent_fields().Length();
-           i++) {
-        field ^= result.deoptimize_dependent_fields().At(i);
-        field.DeoptimizeDependentCode();
-      }
     } else if (FLAG_trace_compiler) {
       THR_Print("Drop code generated in the background compiler:\n");
       result.PrintValidity();
     }
     if (function.usage_counter() < 0) {
       // Reset to 0 so that it can be recompiled if needed.
       function.set_usage_counter(0);
     }
   }
 }
@@ skipping 62 matching lines @@
       isolate->set_background_compiler(task);
       start_task = true;
     }
   }
   if (start_task) {
     Dart::thread_pool()->Run(isolate->background_compiler());
   }
 }
 
 }  // namespace dart