Change the inlining context from an enum to a class.

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/flow_graph_compiler.h"
@@ skipping 113 matching lines @@
       (defn->ssa_temp_index() != -1)) {
     replacement->set_ssa_temp_index(graph->alloc_ssa_temp_index());
   }
 }
 
 
 static void ReplaceCurrentInstruction(ForwardInstructionIterator* it,
                                       Instruction* current,
                                       Instruction* replacement,
                                       FlowGraph* graph) {
-  if ((replacement != NULL) && current->IsDefinition()) {
-    Definition* current_defn = current->AsDefinition();
+  Definition* current_defn = current->AsDefinition();
+  if ((replacement != NULL) && (current_defn != NULL)) {
     Definition* replacement_defn = replacement->AsDefinition();
     ASSERT(replacement_defn != NULL);
     current_defn->ReplaceUsesWith(replacement_defn);
     EnsureSSATempIndex(graph, current_defn, replacement_defn);
 
     if (FLAG_trace_optimization) {
       OS::Print("Replacing v%"Pd" with v%"Pd"\n",
                 current_defn->ssa_temp_index(),
                 replacement_defn->ssa_temp_index());
     }
   } else if (FLAG_trace_optimization) {
-    ASSERT(!current->IsDefinition() ||
-           ((current->AsDefinition()->input_use_list() == NULL) &&
-            (current->AsDefinition()->env_use_list() == NULL)));
-    if (current->IsDefinition()) {
-      OS::Print("Removing v%"Pd".\n",
-                current->AsDefinition()->ssa_temp_index());
+    if (current_defn == NULL) {
+      OS::Print("Removing %s\n", current->DebugName());
     } else {
-      OS::Print("Removing %s\n", current->DebugName());
+      ASSERT(!current_defn->HasUses());
+      OS::Print("Removing v%"Pd".\n", current_defn->ssa_temp_index());
     }
   }
   it->RemoveCurrentFromGraph();
 }
 
 
 void FlowGraphOptimizer::Canonicalize() {
   for (intptr_t i = 0; i < block_order_.length(); ++i) {
     BlockEntryInstr* entry = block_order_[i];
     entry->Accept(this);
@@ skipping 4249 matching lines @@
 
   if (FLAG_trace_constant_propagation) {
     OS::Print("\n==== After constant propagation ====\n");
     FlowGraphPrinter printer(*graph_);
     printer.PrintBlocks();
   }
 }
 
 
 }  // namespace dart