Split deopt-after and deopt-before handling:

runtime/vm/flow_graph_compiler_x64.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_COMPILER_X64_H_
 #define VM_FLOW_GRAPH_COMPILER_X64_H_
 
 #ifndef VM_FLOW_GRAPH_COMPILER_H_
 #error Include flow_graph_compiler.h instead of flow_graph_compiler_x64.h.
 #endif
 
 namespace dart {
 
 class Code;
-class DeoptimizationStub;
 class FlowGraph;
 template <typename T> class GrowableArray;
 class ParsedFunction;
 
 class FlowGraphCompiler : public ValueObject {
  private:
   struct BlockInfo : public ZoneAllocated {
    public:
     BlockInfo() : label() { }
     Label label;
@@ skipping 172 matching lines @@
   void SaveLiveRegisters(LocationSummary* locs);
   void RestoreLiveRegisters(LocationSummary* locs);
 
   intptr_t CurrentTryIndex() const {
     if (current_block_ == NULL) {
       return CatchClauseNode::kInvalidTryIndex;
     }
     return current_block_->try_index();
   }
 
+  // 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:
-  friend class DeoptimizationStub;
-
   void GenerateDeferredCode();
 
   void EmitInstructionPrologue(Instruction* instr);
 
   // Emit code to load a Value into register 'dst'.
   void LoadValue(Register dst, Value* value);
 
   void EmitStaticCall(const Function& function,
                       const Array& arguments_descriptor,
                       intptr_t argument_count,
@@ skipping 58 matching lines @@
   // Map a block number in a forward iteration into the block number in the
   // corresponding reverse iteration.  Used to obtain an index into
   // block_order for reverse iterations.
   intptr_t reverse_index(intptr_t index) const {
     return block_order_.length() - index - 1;
   }
 
   // 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_;
 
   // Compiler specific per-block state.  Indexed by postorder block number
   // for convenience.  This is not the block's index in the block order,
   // which is reverse postorder.
   BlockEntryInstr* current_block_;
   ExceptionHandlerList* exception_handlers_list_;
   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_;
   const bool is_dart_leaf_;
 
   const Bool& bool_true_;
   const Bool& bool_false_;
   const Class& double_class_;
 
   ParallelMoveResolver parallel_move_resolver_;
 
   // Currently instructions generate deopt stubs internally by
   // calling AddDeoptStub.  To communicate deoptimization environment
   // that should be used when deoptimizing we store it in this variable.
   // In future AddDeoptStub should be moved out of the instruction template.
   Environment* pending_deoptimization_env_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_X64_H_