Replace start_env with initial_definitions in GraphEntryInstr.

runtime/vm/flow_graph_optimizer.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_optimizer.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cha.h"
 #include "vm/flow_graph_builder.h"
 #include "vm/hash_map.h"
@@ skipping 108 matching lines @@
         if ((phi != NULL) && (phi->GetPropagatedCid() == kDoubleCid)) {
           phi->set_representation(kUnboxedDouble);
         }
       }
     }
   }
 
   // Process all instructions and insert conversions where needed.
   GraphEntryInstr* graph_entry = block_order_[0]->AsGraphEntry();
 
-  // Visit incoming parameters.
-  for (intptr_t i = 0; i < graph_entry->start_env()->Length(); i++) {
-    Value* val = graph_entry->start_env()->ValueAt(i);
-    InsertConversionsFor(val->definition());
+  // Visit incoming parameters and constants.
+  for (intptr_t i = 0; i < graph_entry->initial_definitions().length(); i++) {
+    InsertConversionsFor(graph_entry->initial_definitions()[i]);
   }
 
   for (intptr_t i = 0; i < block_order_.length(); ++i) {
     BlockEntryInstr* entry = block_order_[i];
 
     JoinEntryInstr* join_entry = entry->AsJoinEntry();
     if ((join_entry != NULL) && (join_entry->phis() != NULL)) {
       for (intptr_t i = 0; i < join_entry->phis()->length(); ++i) {
         PhiInstr* phi = (*join_entry->phis())[i];
         if ((phi != NULL) && (phi->is_alive())) {
@@ skipping 1148 matching lines @@
                                        instr->value(),
                                        instr->type(),
                                        name,
                                        /* eliminated = */ true);
     }
   }
 }
 
 
 void FlowGraphTypePropagator::VisitGraphEntry(GraphEntryInstr* graph_entry) {
-  if (graph_entry->start_env() == NULL) {
-    return;
-  }
   // Visit incoming parameters.
-  for (intptr_t i = 0; i < graph_entry->start_env()->Length(); i++) {
-    Value* val = graph_entry->start_env()->ValueAt(i);
-    ParameterInstr* param = val->definition()->AsParameter();
-    if (param != NULL) {
-      ASSERT(param->index() == i);
-      VisitParameter(param);
-    }
+  for (intptr_t i = 0; i < graph_entry->initial_definitions().length(); i++) {
+    ParameterInstr* param =
+        graph_entry->initial_definitions()[i]->AsParameter();
+    if (param != NULL) VisitParameter(param);
   }
 }
 
 
 void FlowGraphTypePropagator::VisitJoinEntry(JoinEntryInstr* join_entry) {
   if (join_entry->phis() != NULL) {
     for (intptr_t i = 0; i < join_entry->phis()->length(); ++i) {
       PhiInstr* phi = (*join_entry->phis())[i];
       if (phi != NULL) {
         VisitPhi(phi);
@@ skipping 457 matching lines @@
       DirectChainedHashMap<Definition*> child_map(*map);  // Copy map.
       OptimizeRecursive(child, &child_map);
     } else {
       OptimizeRecursive(child, map);  // Reuse map for the last child.
     }
   }
 }
 
 
 }  // namespace dart