Fix printing of deoptimized function.

runtime/vm/code_generator.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/code_generator.h"
 
 #include "vm/assembler_macros.h"
 #include "vm/ast.h"
 #include "vm/bigint_operations.h"
 #include "vm/code_patcher.h"
@@ skipping 1281 matching lines @@
         return;
       } else {
         // TODO(turnidge): Unwind the stack.
         UNIMPLEMENTED();
       }
     }
   }
 }
 
 
-static void PrintCaller(const char* msg) {
-  DartFrameIterator iterator;
-  StackFrame* top_frame = iterator.NextFrame();
-  ASSERT(top_frame != NULL);
-  const Function& top_function = Function::Handle(
-      top_frame->LookupDartFunction());
-  OS::PrintErr("Failed: '%s' %s @ %#"Px"\n",
-      msg, top_function.ToFullyQualifiedCString(), top_frame->pc());
-  StackFrame* caller_frame = iterator.NextFrame();
-  if (caller_frame != NULL) {
-    const Function& caller_function = Function::Handle(
-        caller_frame->LookupDartFunction());
-    const Code& code = Code::Handle(caller_frame->LookupDartCode());
-    OS::PrintErr("  -> caller: %s (%s)\n",
-        caller_function.ToFullyQualifiedCString(),
-        code.is_optimized() ? "optimized" : "unoptimized");
-  }
-}
-
-
 DEFINE_RUNTIME_ENTRY(TraceICCall, 2) {
   ASSERT(arguments.ArgCount() ==
          kTraceICCallRuntimeEntry.argument_count());
   const ICData& ic_data = ICData::CheckedHandle(arguments.ArgAt(0));
   const Function& function = Function::CheckedHandle(arguments.ArgAt(1));
   DartFrameIterator iterator;
   StackFrame* frame = iterator.NextFrame();
   ASSERT(frame != NULL);
   OS::PrintErr("IC call @%#"Px": ICData: %p cnt:%"Pd" nchecks: %"Pd" %s %s\n",
       frame->pc(),
@@ skipping 17 matching lines @@
   if (isolate->debugger()->HasBreakpoint(function)) {
     // We cannot set breakpoints in optimized code, so do not optimize
     // the function.
     function.set_usage_counter(0);
     arguments.SetReturn(Code::Handle(function.CurrentCode()));
     return;
   }
   if (function.deoptimization_counter() >=
       FLAG_deoptimization_counter_threshold) {
     if (FLAG_trace_failed_optimization_attempts) {
-      PrintCaller("Too Many Deoptimizations");
+      OS::PrintErr("Too Many Deoptimizations: %s\n",
+          function.ToFullyQualifiedCString());
     }
     // TODO(srdjan): Investigate excessive deoptimization.
     function.set_usage_counter(kLowInvocationCount);
     arguments.SetReturn(Code::Handle(function.CurrentCode()));
     return;
   }
   if ((FLAG_optimization_filter != NULL) &&
       (strstr(function.ToFullyQualifiedCString(),
               FLAG_optimization_filter) == NULL)) {
     function.set_usage_counter(kLowInvocationCount);
@@ skipping 424 matching lines @@
     return;
   }
   HeapTrace* heap_trace = Isolate::Current()->heap()->trace();
   heap_trace->TraceStoreIntoObject(RawObject::ToAddr(object),
                                    field_addr,
                                    RawObject::ToAddr(value));
 }
 END_LEAF_RUNTIME_ENTRY
 
 }  // namespace dart