Move ConstantPropagator from flow_graph_optimizer.cc/.h into separate files.

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 298 matching lines @@
   static void Optimize(FlowGraph* graph);
 };
 
 
 class DeadCodeElimination : public AllStatic {
  public:
   static void EliminateDeadPhis(FlowGraph* graph);
 };
 
 
-// Sparse conditional constant propagation and unreachable code elimination.
-// Assumes that use lists are computed and preserves them.
-class ConstantPropagator : public FlowGraphVisitor {
- public:
-  ConstantPropagator(FlowGraph* graph,
-                     const GrowableArray<BlockEntryInstr*>& ignored);
-
-  static void Optimize(FlowGraph* graph);
-
-  // (1) Visit branches to optimize away unreachable blocks discovered  by range
-  // analysis.
-  // (2) Eliminate branches that have the same true- and false-target: For
-  // example, this occurs after expressions like
-  //
-  // if (a == null || b == null) {
-  //   ...
-  // }
-  //
-  // where b is known to be null.
-  static void OptimizeBranches(FlowGraph* graph);
-
-  // Used to initialize the abstract value of definitions.
-  static RawObject* Unknown() { return Object::unknown_constant().raw(); }
-
- private:
-  void Analyze();
-  void Transform();
-  void EliminateRedundantBranches();
-
-  void SetReachable(BlockEntryInstr* block);
-  bool SetValue(Definition* definition, const Object& value);
-
-  Definition* UnwrapPhi(Definition* defn);
-  void MarkPhi(Definition* defn);
-
-  // Assign the join (least upper bound) of a pair of abstract values to the
-  // first one.
-  void Join(Object* left, const Object& right);
-
-  bool IsUnknown(const Object& value) {
-    return value.raw() == unknown_.raw();
-  }
-  bool IsNonConstant(const Object& value) {
-    return value.raw() == non_constant_.raw();
-  }
-  bool IsConstant(const Object& value) {
-    return !IsNonConstant(value) && !IsUnknown(value);
-  }
-
-  void VisitBinaryIntegerOp(BinaryIntegerOpInstr* binary_op);
-
-  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_;
-
-  BitVector* marked_phis_;
-
-  // Worklists of blocks and definitions.
-  GrowableArray<BlockEntryInstr*> block_worklist_;
-  DefinitionWorklist definition_worklist_;
-};
-
-
 // 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.
@@ skipping 98 matching lines @@
 // 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_