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

runtime/vm/flow_graph_optimizer.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_OPTIMIZER_H_
 #define VM_FLOW_GRAPH_OPTIMIZER_H_
 
 #include "vm/intermediate_language.h"
 #include "vm/flow_graph.h"
 
@@ skipping 53 matching lines @@
   void InsertBefore(Instruction* next,
                     Instruction* instr,
                     Environment* env,
                     FlowGraph::UseKind use_kind) {
     flow_graph_->InsertBefore(next, instr, env, use_kind);
   }
 
  private:
   // Attempt to build ICData for call using propagated class-ids.
   bool TryCreateICData(InstanceCallInstr* call);
+  const ICData& TrySpecializeICData(const ICData& ic_data, intptr_t cid);
 
   void SpecializePolymorphicInstanceCall(PolymorphicInstanceCallInstr* call);
 
   bool TryReplaceWithStoreIndexed(InstanceCallInstr* call);
   bool InlineSetIndexed(MethodRecognizer::Kind kind,
                         const Function& target,
                         Instruction* call,
                         Definition* receiver,
                         intptr_t token_pos,
                         const ICData* ic_data,
@@ skipping 35 matching lines @@
                                 MethodRecognizer::Kind recognized_kind);
   bool TryInlineFloat64x2Method(InstanceCallInstr* call,
                                 MethodRecognizer::Kind recognized_kind);
   bool TryInlineInt32x4Method(InstanceCallInstr* call,
                                MethodRecognizer::Kind recognized_kind);
   void ReplaceWithInstanceOf(InstanceCallInstr* instr);
   void ReplaceWithTypeCast(InstanceCallInstr* instr);
 
   bool TryReplaceInstanceCallWithInline(InstanceCallInstr* call);
 
+  LoadFieldInstr* BuildLoadStringLength(Definition* str);
+
   Definition* PrepareInlineStringIndexOp(Instruction* call,
                                          intptr_t cid,
                                          Definition* str,
                                          Definition* index,
                                          Instruction* cursor);
 
   bool InlineStringCodeUnitAt(Instruction* call,
                               intptr_t cid,
                               TargetEntryInstr** entry,
                               Definition** last);
@@ skipping 97 matching lines @@
                                     Definition* left_instr,
                                     Definition* right_instr);
   void TryMergeTruncDivMod(GrowableArray<BinarySmiOpInstr*>* merge_candidates);
   void TryMergeMathUnary(GrowableArray<MathUnaryInstr*>* merge_candidates);
 
   void AppendLoadIndexedForMerged(Definition* instr, intptr_t ix, intptr_t cid);
   void AppendExtractNthOutputForMerged(Definition* instr, intptr_t ix,
                                        Representation rep, intptr_t cid);
   bool TryStringLengthOneEquality(InstanceCallInstr* call, Token::Kind op_kind);
 
+  Isolate* isolate() const { return flow_graph_->isolate(); }
+
   FlowGraph* flow_graph_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphOptimizer);
 };
 
 
 // Loop invariant code motion.
 class LICM : public ValueObject {
  public:
   explicit LICM(FlowGraph* flow_graph);
@@ skipping 95 matching lines @@
                       Token::Kind op_kind,
                       const Value& left,
                       const Value& right);
 
   virtual void VisitBlocks() { UNREACHABLE(); }
 
 #define DECLARE_VISIT(type) virtual void Visit##type(type##Instr* instr);
   FOR_EACH_INSTRUCTION(DECLARE_VISIT)
 #undef DECLARE_VISIT
 
+  Isolate* isolate() const { return graph_->isolate(); }
+
   FlowGraph* graph_;
 
   // Sentinels for unknown constant and non-constant values.
   const Object& unknown_;
   const Object& non_constant_;
 
   // Analysis results. For each block, a reachability bit.  Indexed by
   // preorder number.
   BitVector* reachable_;
 
@@ skipping 11 matching lines @@
 // Rewrite branches to eliminate materialization of boolean values after
 // inlining, and to expose other optimizations (e.g., constant folding of
 // branches, unreachable code elimination).
 class BranchSimplifier : public AllStatic {
  public:
   static void Simplify(FlowGraph* flow_graph);
 
   // Replace a target entry instruction with a join entry instruction.  Does
   // not update the original target's predecessors to point to the new block
   // and does not replace the target in already computed block order lists.
-  static JoinEntryInstr* ToJoinEntry(TargetEntryInstr* target);
+  static JoinEntryInstr* ToJoinEntry(Isolate* isolate,
+                                     TargetEntryInstr* target);
 
  private:
   // Match an instance of the pattern to rewrite.  See the implementation
   // for the patterns that are handled by this pass.
   static bool Match(JoinEntryInstr* block);
 
   // Duplicate a branch while replacing its comparison's left and right
   // inputs.
-  static BranchInstr* CloneBranch(BranchInstr* branch,
+  static BranchInstr* CloneBranch(Isolate* isolate,
+                                  BranchInstr* branch,
                                   Value* new_left,
                                   Value* new_right);
 };
 
 
 // Rewrite diamond control flow patterns that materialize values to use more
 // efficient branchless code patterns if such are supported on the current
 // platform.
 class IfConverter : public AllStatic {
  public:
@@ skipping 13 matching lines @@
 
  private:
   void InsertMaterializations(AllocateObjectInstr* alloc);
 
   void CreateMaterializationAt(
       Instruction* exit,
       AllocateObjectInstr* alloc,
       const Class& cls,
       const ZoneGrowableArray<const Object*>& fields);
 
+  Isolate* isolate() const { return flow_graph_->isolate(); }
+
   FlowGraph* flow_graph_;
 
   GrowableArray<MaterializeObjectInstr*> materializations_;
 };
 
 
 // Optimize spill stores inside try-blocks by identifying values that always
 // contain a single known constant at catch block entry.
 class TryCatchAnalyzer : public AllStatic {
  public:
   static void Optimize(FlowGraph* flow_graph);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_OPTIMIZER_H_