Revert several inlining related changes.

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"
 
@@ skipping 22 matching lines @@
 
  private:
   const GrowableArray<BlockEntryInstr*>& block_order_;
   intptr_t current_;
 };
 
 
 // Class to incapsulate the construction and manipulation of the flow graph.
 class FlowGraph : public ZoneAllocated {
  public:
-  FlowGraph(const FlowGraphBuilder& builder,
-            GraphEntryInstr* graph_entry,
-            intptr_t max_block_id);
+  FlowGraph(const FlowGraphBuilder& builder, GraphEntryInstr* graph_entry);
 
   // Function properties.
   const ParsedFunction& parsed_function() const {
     return parsed_function_;
   }
   intptr_t parameter_count() const {
     return num_copied_params_ + num_non_copied_params_;
   }
   intptr_t variable_count() const {
     return parameter_count() + num_stack_locals_;
@@ skipping 26 matching lines @@
   BlockIterator postorder_iterator() const {
     return BlockIterator(postorder());
   }
 
   intptr_t current_ssa_temp_index() const { return current_ssa_temp_index_; }
 
   intptr_t max_virtual_register_number() const {
     return current_ssa_temp_index();
   }
 
-  intptr_t max_block_id() const {
-    return max_block_id_;
-  }
-
   GraphEntryInstr* graph_entry() const {
     return graph_entry_;
   }
 
   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_++; }
 
-  intptr_t InstructionCount() const;
-
   // Operations on the flow graph.
   void ComputeSSA(intptr_t next_virtual_register_number);
   void ComputeUseLists();
 
   // Finds natural loops in the flow graph and attaches a list of loop
   // body blocks for each loop header.
   void ComputeLoops(GrowableArray<BlockEntryInstr*>* loop_headers);
 
   void InlineCall(Definition* call, FlowGraph* callee_graph);
 
@@ skipping 32 matching lines @@
       const GrowableArray<BitVector*>& dom_frontier);
 
   void MarkLivePhis(GrowableArray<PhiInstr*>* live_phis);
 
   // DiscoverBlocks computes parent_ and assigned_vars_ which are then used
   // if/when computing SSA.
   GrowableArray<intptr_t> parent_;
   GrowableArray<BitVector*> assigned_vars_;
 
   intptr_t current_ssa_temp_index_;
-  intptr_t max_block_id_;
 
   // Flow graph fields.
   const ParsedFunction& parsed_function_;
   const intptr_t num_copied_params_;
   const intptr_t num_non_copied_params_;
   const intptr_t num_stack_locals_;
   GraphEntryInstr* graph_entry_;
   GrowableArray<BlockEntryInstr*> preorder_;
   GrowableArray<BlockEntryInstr*> postorder_;
   GrowableArray<BlockEntryInstr*> reverse_postorder_;
   ZoneGrowableArray<ReturnInstr*>* exits_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_H_