Replace start_env with initial_definitions in GraphEntryInstr.

runtime/vm/flow_graph_inliner.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/flow_graph_inliner.h"
 
 #include "vm/compiler.h"
 #include "vm/flags.h"
 #include "vm/flow_graph.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 112 matching lines @@
       DEBUG_ASSERT(caller_graph_->ValidateUseLists());
 
       // Remove push arguments of the call.
       for (intptr_t i = 0; i < call->ArgumentCount(); ++i) {
         PushArgumentInstr* push = call->ArgumentAt(i);
         push->ReplaceUsesWith(push->value()->definition());
         push->RemoveFromGraph();
       }
 
       // Replace formal parameters with actuals.
-      for (intptr_t i = 0; i < arguments->length(); ++i) {
-        Value* val = callee_graph->graph_entry()->start_env()->ValueAt(i);
-        ParameterInstr* param = val->definition()->AsParameter();
-        ASSERT(param != NULL);
-        param->ReplaceUsesWith((*arguments)[i]->definition());
+      intptr_t j = 0;

[Kevin Millikin (Google), 2012/09/19 11:49:29]

j ==> arg_index or arg_idx or the like.

+      for (intptr_t i = 0;
+           i < callee_graph->graph_entry()->initial_definitions().length();
+           ++i) {
+        ParameterInstr* param =
+          callee_graph->graph_entry()->initial_definitions()[i]->AsParameter();
+        if (param != NULL) {
+          param->ReplaceUsesWith((*arguments)[j++]->definition());
+        }
       }
+      ASSERT(j == arguments->length());
 
       // Replace callee's null constant with caller's null constant.
       callee_graph->graph_entry()->constant_null()->ReplaceUsesWith(
           caller_graph_->graph_entry()->constant_null());
 
       TRACE_INLINING(OS::Print("     Success\n"));
 
       // Build succeeded so we restore the bailout jump.
       inlined_ = true;
       isolate->set_long_jump_base(base);
@@ skipping 90 matching lines @@
     if (FLAG_trace_inlining && FLAG_print_flow_graph) {
       OS::Print("After Inlining of %s\n", flow_graph_->
                 parsed_function().function().ToFullyQualifiedCString());
       FlowGraphPrinter printer(*flow_graph_);
       printer.PrintBlocks();
     }
   }
 }
 
 }  // namespace dart