Undo r35207

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 14 matching lines @@
 #include "vm/il_printer.h"
 #include "vm/longjump.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/os.h"
 #include "vm/parser.h"
 #include "vm/scanner.h"
 #include "vm/symbols.h"
 #include "vm/tags.h"
 #include "vm/timer.h"
-#include "vm/trace_buffer.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, allocation_sinking, true,
     "Attempt to sink temporary allocations to side exits");
 DEFINE_FLAG(bool, common_subexpression_elimination, true,
     "Do common subexpression elimination.");
 DEFINE_FLAG(bool, constant_propagation, true,
     "Do conditional constant propagation/unreachable code elimination.");
 DEFINE_FLAG(int, deoptimization_counter_threshold, 16,
@@ skipping 552 matching lines @@
           Object::branch_offset_error().raw()) {
         // Compilation failed due to an out of range branch offset in the
         // assembler. We try again (done = false) with far branches enabled.
         done = false;
         ASSERT(!use_far_branches);
         use_far_branches = true;
       } else {
         // If the error isn't due to an out of range branch offset, we don't
         // try again (done = true), and indicate that we did not finish
         // compiling (is_compiled = false).
-        const Error& bailout_error = Error::Handle(
+        if (FLAG_trace_bailout) {
+          const Error& bailout_error = Error::Handle(
               isolate->object_store()->sticky_error());
-        if (FLAG_trace_bailout) {
           OS::Print("%s\n", bailout_error.ToErrorCString());
         }
-        function.log()->TraceF("Failed to compile optimized code: %s",
-                               bailout_error.ToErrorCString());
         done = true;
         ASSERT(optimized);
       }
 
       isolate->object_store()->clear_sticky_error();
       is_compiled = false;
     }
     // Reset global isolate state.
     isolate->set_deopt_id(prev_deopt_id);
   }
@@ skipping 138 matching lines @@
   if (!optimized && !unoptimized_code.IsNull()) {
     InstallUnoptimizedCode(function);
     return Error::null();
   }
   if (setjmp(*jump.Set()) == 0) {
     TIMERSCOPE(isolate, time_compilation);
     Timer per_compile_timer(FLAG_trace_compiler, "Compilation time");
     per_compile_timer.Start();
     ParsedFunction* parsed_function =
         new ParsedFunction(Function::ZoneHandle(function.raw()));
-    function.log()->TraceF("Compiled %s%s",
-                           (osr_id == Isolate::kNoDeoptId ? "" : "osr "),
-                           (optimized ? "optimized " : ""));
     if (FLAG_trace_compiler) {
       OS::Print("Compiling %s%sfunction: '%s' @ token %" Pd ", size %" Pd "\n",
                 (osr_id == Isolate::kNoDeoptId ? "" : "osr "),
                 (optimized ? "optimized " : ""),
                 function.ToFullyQualifiedCString(),
                 function.token_pos(),
                 (function.end_token_pos() - function.token_pos()));
     }
     {
       HANDLESCOPE(isolate);
       Parser::ParseFunction(parsed_function);
       parsed_function->AllocateVariables();
     }
 
     const bool success =
         CompileParsedFunctionHelper(parsed_function, optimized, osr_id);
     if (optimized && !success) {
       // Optimizer bailed out. Disable optimizations and to never try again.
-      function.log()->TraceF("Optimizations disabled");
       if (FLAG_trace_compiler) {
         OS::Print("--> disabling optimizations for '%s'\n",
                   function.ToFullyQualifiedCString());
       } else if (FLAG_trace_failed_optimization_attempts) {
         OS::Print("Cannot optimize: %s\n", function.ToFullyQualifiedCString());
       }
       function.SetIsOptimizable(false);
       return Error::null();
     }
 
@@ skipping 161 matching lines @@
     const Object& result =
       Object::Handle(isolate->object_store()->sticky_error());
     isolate->object_store()->clear_sticky_error();
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 }  // namespace dart