Reapply "Remove classes Computation and BindInstr."

runtime/vm/flow_graph.h

 // 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.
 
 #ifndef VM_FLOW_GRAPH_H_
 #define VM_FLOW_GRAPH_H_
 
 #include "vm/growable_array.h"
 #include "vm/parser.h"
 
 namespace dart {
 
-class BindInstr;
 class BlockEntryInstr;
-class StaticCallComp;
 class Definition;
 class FlowGraphBuilder;
 class GraphEntryInstr;
 class PhiInstr;
 class ReturnInstr;
+class StaticCallInstr;
 
 // Class to incapsulate the construction and manipulation of the flow graph.
 class FlowGraph: public ZoneAllocated {
  public:
   FlowGraph(const FlowGraphBuilder& builder, GraphEntryInstr* graph_entry);
 
   // Function properties.
   const ParsedFunction& parsed_function() const {
     return parsed_function_;
   }
@@ skipping 34 matching lines @@
 
   ZoneGrowableArray<ReturnInstr*>* exits() const { return exits_; }
   void set_exits(ZoneGrowableArray<ReturnInstr*>* exits) { exits_ = exits; }
 
   intptr_t alloc_ssa_temp_index() { return current_ssa_temp_index_++; }
 
   // Operations on the flow graph.
   void ComputeSSA(intptr_t next_virtual_register_number = 0);
   void ComputeUseLists();
 
-  void InlineCall(BindInstr* caller_instr,
-                  StaticCallComp* caller_comp,
-                  FlowGraph* callee_graph);
+  void InlineCall(StaticCallInstr* call, FlowGraph* callee_graph);
 
   // TODO(zerny): Once the SSA is feature complete this should be removed.
   void Bailout(const char* reason) const;
 
 #ifdef DEBUG
   // Validation methods for debugging.
   bool ResetUseLists();
   bool ValidateUseLists();
 #endif  // DEBUG
 
@@ skipping 42 matching lines @@
   GraphEntryInstr* graph_entry_;
   GrowableArray<BlockEntryInstr*> preorder_;
   GrowableArray<BlockEntryInstr*> postorder_;
   GrowableArray<BlockEntryInstr*> reverse_postorder_;
   ZoneGrowableArray<ReturnInstr*>* exits_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_H_