Fix disassembly output for background compilation; modify some tests to run long enough for backgro…

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 1124 matching lines @@
                 Code::Handle(function.CurrentCode()).Size(),
                 per_compile_timer.TotalElapsedTime());
     }
 
     isolate->debugger()->NotifyCompilation(function);
 
     if (FLAG_disassemble && FlowGraphPrinter::ShouldPrint(function)) {
       DisassembleCode(function, optimized);
     } else if (FLAG_disassemble_optimized &&
                optimized &&
-               FlowGraphPrinter::ShouldPrint(function)) {
+               FlowGraphPrinter::ShouldPrint(function) &&
+               (result == NULL) /* no background compilation*/ ) {
+      // With background compilation, print when installing the code.
       // TODO(fschneider): Print unoptimized code along with the optimized code.
       THR_Print("*** BEGIN CODE\n");
       DisassembleCode(function, true);
       THR_Print("*** END CODE\n");
     }
 #if defined(DEBUG)
     CheckInliningIntervals(function);
 #endif
     return Error::null();
   } else {
@@ skipping 704 matching lines @@
     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 */);
+      if (FLAG_trace_compiler) {
+        THR_Print("Installing optimized code for %s\n",
+            function.ToQualifiedCString());
+      }
       // 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);
       }
       for (intptr_t i = 0; i < result.guarded_fields().Length(); i++) {
         field ^= result.guarded_fields().At(i);
         field.RegisterDependentCode(code);
       }
     } 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);
     }
+    if (result.IsValid() &&
+        FLAG_disassemble_optimized &&
+        FlowGraphPrinter::ShouldPrint(function)) {
+      THR_Print("*** BEGIN CODE\n");
+      DisassembleCode(function, true);
+      THR_Print("*** END CODE\n");
+    }
   }
 }
 
 
 void BackgroundCompiler::VisitPointers(ObjectPointerVisitor* visitor) {
   function_queue_->VisitObjectPointers(visitor);
   result_queue_->VisitObjectPointers(visitor);
 }
 
 
@@ skipping 54 matching lines @@
       isolate->set_background_compiler(task);
       start_task = true;
     }
   }
   if (start_task) {
     Dart::thread_pool()->Run(isolate->background_compiler());
   }
 }
 
 }  // namespace dart