Use isolate when allocation Zone objects and handles: focus on FlowGraphOptimizer, next inliner.

runtime/vm/flow_graph.h

 // Copyright (c) 2013, 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/intermediate_language.h"
 #include "vm/parser.h"
@@ skipping 84 matching lines @@
 
   intptr_t current_ssa_temp_index() const { return current_ssa_temp_index_; }
   void set_current_ssa_temp_index(intptr_t index) {
     current_ssa_temp_index_ = index;
   }
 
   intptr_t max_virtual_register_number() const {
     return current_ssa_temp_index();
   }
 
+  Isolate* isolate() const { return isolate_; }
+
   intptr_t max_block_id() const { return max_block_id_; }
   void set_max_block_id(intptr_t id) { max_block_id_ = id; }
   intptr_t allocate_block_id() { return ++max_block_id_; }
 
   GraphEntryInstr* graph_entry() const {
     return graph_entry_;
   }
 
   ConstantInstr* constant_null() const {
     return constant_null_;
@@ skipping 52 matching lines @@
   void ComputeBlockEffects();
   BlockEffects* block_effects() const { return block_effects_; }
 
   // Remove the redefinition instructions inserted to inhibit code motion.
   void RemoveRedefinitions();
 
   // Copy deoptimization target from one instruction to another if we still
   // have to keep deoptimization environment at gotos for LICM purposes.
   void CopyDeoptTarget(Instruction* to, Instruction* from) {
     if (is_licm_allowed()) {
-      to->InheritDeoptTarget(from);
+      to->InheritDeoptTarget(isolate(), from);
     }
   }
 
   // Returns true if every Goto in the graph is expected to have a
   // deoptimization environment and can be used as deoptimization target
   // for hoisted instructions.
   bool is_licm_allowed() const { return licm_allowed_; }
 
   // Stop preserving environments on Goto instructions. LICM is not allowed
   // after this point.
@@ skipping 71 matching lines @@
   // information to block n (loop header). The algorithm is described in
   // "Advanced Compiler Design & Implementation" (Muchnick) p192.
   // Returns a BitVector indexed by block pre-order number where each bit
   // indicates membership in the loop.
   BitVector* FindLoop(BlockEntryInstr* m, BlockEntryInstr* n);
 
   // Finds natural loops in the flow graph and attaches a list of loop
   // body blocks for each loop header.
   ZoneGrowableArray<BlockEntryInstr*>* ComputeLoops();
 
+  Isolate* isolate_;
+
   // 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 FlowGraphBuilder& builder_;
@@ skipping 115 matching lines @@
   // Per block sets of available blocks. Block A is available at the block B if
   // and only if A dominates B and all paths from A to B are free of side
   // effects.
   GrowableArray<BitVector*> available_at_;
 };
 
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_H_