Split deopt-after and deopt-before handling:

runtime/vm/flow_graph_compiler_x64.h

Index: runtime/vm/flow_graph_compiler_x64.h
===================================================================
--- runtime/vm/flow_graph_compiler_x64.h	(revision 11719)
+++ runtime/vm/flow_graph_compiler_x64.h	(working copy)
@@ -12,7 +12,6 @@
 namespace dart {
 
 class Code;
-class DeoptimizationStub;
 class FlowGraph;
 template <typename T> class GrowableArray;
 class ParsedFunction;
@@ -205,9 +204,11 @@
     return current_block_->try_index();
   }
 
- private:
-  friend class DeoptimizationStub;
+  // Returns true if the generated code does not call other Dart code or
+  // runtime. Only deoptimization is allowed to occur. Closures are not leaf.
+  bool IsLeaf() const;
 
+ private:
   void GenerateDeferredCode();
 
   void EmitInstructionPrologue(Instruction* instr);
@@ -286,10 +287,6 @@
   // Perform a greedy local register allocation.  Consider all registers free.
   void AllocateRegistersLocally(Instruction* instr);
 
-  // Returns true if the generated code does not call other Dart code or
-  // runtime. Only deoptimization is allowed to occur. Closures are not leaf.
-  bool IsLeaf() const;
-
   class Assembler* assembler_;
   const ParsedFunction& parsed_function_;
   const GrowableArray<BlockEntryInstr*>& block_order_;
@@ -302,7 +299,7 @@
   DescriptorList* pc_descriptors_list_;
   StackmapTableBuilder* stackmap_table_builder_;
   GrowableArray<BlockInfo*> block_info_;
-  GrowableArray<DeoptimizationStub*> deopt_stubs_;
+  GrowableArray<CompilerDeoptInfo*> deopt_infos_;
   GrowableArray<SlowPathCode*> slow_path_code_;
   const GrowableObjectArray& object_table_;
   const bool is_optimizing_;