Revert several inlining related changes.

runtime/vm/flow_graph.h

Index: runtime/vm/flow_graph.h
diff --git a/runtime/vm/flow_graph.h b/runtime/vm/flow_graph.h
index 8b28b718cb0038a2973cd4fe7cd28779dce35c25..05f2944aba6d200b10218d6e9a67602955eb2ef3 100644
--- a/runtime/vm/flow_graph.h
+++ b/runtime/vm/flow_graph.h
@@ -40,9 +40,7 @@ class BlockIterator : public ValueObject {
 // 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 {
@@ -89,10 +87,6 @@ class FlowGraph : public ZoneAllocated {
     return current_ssa_temp_index();
   }
 
-  intptr_t max_block_id() const {
-    return max_block_id_;
-  }
-
   GraphEntryInstr* graph_entry() const {
     return graph_entry_;
   }
@@ -102,8 +96,6 @@ class FlowGraph : public ZoneAllocated {
 
   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();
@@ -156,7 +148,6 @@ class FlowGraph : public ZoneAllocated {
   GrowableArray<BitVector*> assigned_vars_;
 
   intptr_t current_ssa_temp_index_;
-  intptr_t max_block_id_;
 
   // Flow graph fields.
   const ParsedFunction& parsed_function_;