Inlining functions with control flow.

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 05f2944aba6d200b10218d6e9a67602955eb2ef3..ad2bb3054cacabf9dcaae63351fa9ded23d0ea59 100644
--- a/runtime/vm/flow_graph.h
+++ b/runtime/vm/flow_graph.h
@@ -40,7 +40,9 @@ 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);
+  FlowGraph(const FlowGraphBuilder& builder,
+            GraphEntryInstr* graph_entry,
+            intptr_t max_block_id);
 
   // Function properties.
   const ParsedFunction& parsed_function() const {
@@ -87,6 +89,10 @@ 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_;
   }
@@ -148,6 +154,7 @@ 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_;