Don't inline functions above the deoptimization threshold.

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/code_patcher.h"
 #include "vm/compiler.h"
@@ skipping 1563 matching lines @@
 
 
   DeoptInfo& deopt_info = DeoptInfo::Handle();
   DeoptReasonId deopt_reason = kDeoptUnknown;
   GetDeoptInfoAtPc(optimized_code, caller_frame->pc(), &deopt_info,
                    &deopt_reason);
   ASSERT(!deopt_info.IsNull());
 
   CopyFrame(optimized_code, *caller_frame);
   if (FLAG_trace_deoptimization) {
-    OS::Print("Deoptimizing (reason %d '%s') at pc %#"Px" '%s'\n",
+    OS::Print("Deoptimizing (reason %d '%s') at pc %#"Px" '%s' (count %d)\n",
         deopt_reason,
         DeoptReasonToText(deopt_reason),
         caller_frame->pc(),
-        Function::Handle(optimized_code.function()).ToFullyQualifiedCString());
+        Function::Handle(optimized_code.function()).ToFullyQualifiedCString(),

[Kevin Millikin (Google), 2012/10/04 11:37:59]

Not a bit deal, but we don't need two handles here.

[zerny-google, 2012/10/04 12:18:41]

Done.

+        Function::Handle(optimized_code.function()).deoptimization_counter());
   }
 
   // Compute the stack size of the unoptimized frame.  For functions with
   // optional arguments the deoptimization info does not describe the
   // incoming arguments.
   const Function& function = Function::Handle(optimized_code.function());
   const intptr_t num_args =
       function.HasOptionalParameters() ? 0 : function.num_fixed_parameters();
   intptr_t unoptimized_stack_size =
       + deopt_info.Length() - num_args
@@ skipping 73 matching lines @@
   const intptr_t caller_fp =
       DeoptimizeWithDeoptInfo(optimized_code, deopt_info, *caller_frame);
 
   isolate->SetDeoptFrameCopy(NULL, 0);
   isolate->set_deopt_cpu_registers_copy(NULL);
   isolate->set_deopt_xmm_registers_copy(NULL);
   delete[] frame_copy;
   delete[] cpu_registers_copy;
   delete[] xmm_registers_copy;
 
-  // Clear invocation counter so that the function gets optimized after
-  // classes have been collected.
-  function.set_usage_counter(0);
-  function.set_deoptimization_counter(function.deoptimization_counter() + 1);
-
-  if (function.HasOptimizedCode()) {
-    function.SwitchToUnoptimizedCode();
-  }
   return caller_fp;
 }
 END_LEAF_RUNTIME_ENTRY
 
 
 // This is the last step in the deoptimization, GC can occur.
 DEFINE_RUNTIME_ENTRY(DeoptimizeMaterializeDoubles, 0) {
   DeferredDouble* deferred_double = Isolate::Current()->DetachDeferredDoubles();
 
   while (deferred_double != NULL) {
@@ skipping 43 matching lines @@
     intptr_t line, column;
     script.GetTokenLocation(token_pos, &line, &column);
     String& line_string = String::Handle(script.GetLine(line));
     OS::Print("  Function: %s\n", top_function.ToFullyQualifiedCString());
     OS::Print("  Line %"Pd": '%s'\n", line, line_string.ToCString());
   }
 }
 
 
 }  // namespace dart