Replace deopt stubs location/register shuffling with using deopt-info.

runtime/vm/flow_graph_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/globals.h"  // Needed here to get TARGET_ARCH_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 13 matching lines @@
 DEFINE_FLAG(bool, trace_functions, false, "Trace entry of each function.");
 DECLARE_FLAG(bool, code_comments);
 DECLARE_FLAG(bool, enable_type_checks);
 DECLARE_FLAG(bool, intrinsify);
 DECLARE_FLAG(bool, report_usage_count);
 DECLARE_FLAG(bool, trace_functions);
 DECLARE_FLAG(int, optimization_counter_threshold);
 
 RawDeoptInfo* DeoptimizationStub::CreateDeoptInfo(FlowGraphCompiler* compiler) {
   if (deoptimization_env_ == NULL) return DeoptInfo::null();
+  const Function& function = compiler->parsed_function().function();
+  // For functions with optional arguments, all incoming are copied to local
+  // area below FP, deoptimization environment does not track them.
+  const intptr_t num_args = (function.num_optional_parameters() > 0) ?
+      0 : function.num_fixed_parameters();
   const intptr_t fixed_parameter_count =
       deoptimization_env_->fixed_parameter_count();
-  DeoptInfoBuilder builder(compiler->object_table(), fixed_parameter_count);
+  DeoptInfoBuilder builder(compiler->object_table(), num_args);
 
-  const Function& function = compiler->parsed_function().function();
   intptr_t slot_ix = 0;
   builder.AddReturnAddress(function, deopt_id_, slot_ix++);
 
   // All locals between TOS and PC-marker.
   const GrowableArray<Value*>& values = deoptimization_env_->values();
   // const intptr_t local_slot_count = values.length() - fixed_parameter_count;
   for (intptr_t i = values.length() - 1; i >= fixed_parameter_count; i--) {
     builder.AddCopy(deoptimization_env_->LocationAt(i), *values[i], slot_ix++);
   }
 
@@ skipping 802 matching lines @@
       return;
     }
   }
 
   // This move is not blocked.
   EmitMove(index);
 }
 
 
 }  // namespace dart