Revert "Switch to a fix-point based range analysis to improve its precision."

runtime/vm/intermediate_language.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_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 1932 matching lines @@
   // formatting. Otherwise, it prints in the format "opcode(op1, op2, op3)".
   virtual void PrintTo(BufferFormatter* f) const;
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   // A value in the constant propagation lattice.
   //    - non-constant sentinel
   //    - a constant (any non-sentinel value)
   //    - unknown sentinel
   Object& constant_value() const { return constant_value_; }
 
-  virtual void InferRange(Range* range);
+  virtual void InferRange();
 
   Range* range() const { return range_; }
-  void set_range(const Range&);
 
   // Definitions can be canonicalized only into definitions to ensure
   // this check statically we override base Canonicalize with a Canonicalize
   // returning Definition (return type is covariant).
   virtual Definition* Canonicalize(FlowGraph* flow_graph);
 
   static const intptr_t kReplacementMarker = -2;
 
   Definition* Replacement() {
     if (ssa_temp_index_ == kReplacementMarker) {
@@ skipping 130 matching lines @@
 
   virtual intptr_t Hashcode() const {
     UNREACHABLE();
     return 0;
   }
 
   DECLARE_INSTRUCTION(Phi)
 
   virtual void PrintTo(BufferFormatter* f) const;
 
-  virtual void InferRange(Range* range);
+  virtual void InferRange();
 
   BitVector* reaching_defs() const {
     return reaching_defs_;
   }
 
   void set_reaching_defs(BitVector* reaching_defs) {
     reaching_defs_ = reaching_defs;
   }
 
   virtual bool MayThrow() const { return false; }
@@ skipping 476 matching lines @@
     return false;
   }
 
   virtual bool MayThrow() const { return false; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   Value* value() const { return inputs_[0]; }
   Range* constraint() const { return constraint_; }
 
-  virtual void InferRange(Range* range);
+  virtual void InferRange();
 
   void AddDependency(Definition* defn) {
     Value* val = new Value(defn);
     defn->AddInputUse(val);
     SetInputAt(1, val);
   }
 
   // Constraints for branches have their target block stored in order
   // to find the the comparsion that generated the constraint:
   // target->predecessor->last_instruction->comparison.
@@ skipping 24 matching lines @@
   virtual CompileType ComputeType() const;
 
   virtual Definition* Canonicalize(FlowGraph* flow_graph);
 
   const Object& value() const { return value_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
 
-  virtual void InferRange(Range* range);
+  virtual void InferRange();
 
   virtual bool AllowsCSE() const { return true; }
   virtual EffectSet Effects() const { return EffectSet::None(); }
   virtual EffectSet Dependencies() const { return EffectSet::None(); }
   virtual bool AttributesEqual(Instruction* other) const;
 
   virtual bool MayThrow() const { return false; }
 
  private:
   const Object& value_;
@@ skipping 616 matching lines @@
   }
 
   virtual Representation RequiredInputRepresentation(intptr_t i) const {
     return comparison()->RequiredInputRepresentation(i);
   }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual CompileType ComputeType() const;
 
-  virtual void InferRange(Range* range);
+  virtual void InferRange();
 
   ComparisonInstr* comparison() const { return comparison_; }
   intptr_t if_true() const { return if_true_; }
   intptr_t if_false() const { return if_false_; }
 
   virtual bool AllowsCSE() const { return comparison()->AllowsCSE(); }
   virtual EffectSet Effects() const { return comparison()->Effects(); }
   virtual EffectSet Dependencies() const {
     return comparison()->Dependencies();
   }
@@ skipping 613 matching lines @@
 
   virtual bool CanDeoptimize() const {
     return deopt_id_ != Isolate::kNoDeoptId;
   }
 
   bool Typed32BitIsSmi() const {
     return kSmiBits >= 32;
   }
 
   virtual Representation representation() const;
-  virtual void InferRange(Range* range);
+  virtual void InferRange();
 
   virtual bool AllowsCSE() const { return false; }
   virtual EffectSet Effects() const { return EffectSet::None(); }
   virtual EffectSet Dependencies() const;
   virtual bool AttributesEqual(Instruction* other) const;
 
   virtual bool MayThrow() const { return false; }
 
  private:
   const intptr_t index_scale_;
@@ skipping 548 matching lines @@
     return recognized_kind_;
   }
 
   DECLARE_INSTRUCTION(LoadField)
   virtual CompileType ComputeType() const;
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
 
-  virtual void InferRange(Range* range);
+  virtual void InferRange();
 
   bool IsImmutableLengthLoad() const;
 
   virtual Definition* Canonicalize(FlowGraph* flow_graph);
 
   static MethodRecognizer::Kind RecognizedKindFromArrayCid(intptr_t cid);
 
   static bool IsFixedLengthArrayCid(intptr_t cid);
 
   virtual bool AllowsCSE() const { return immutable_; }
@@ skipping 378 matching lines @@
 
   virtual Representation RequiredInputRepresentation(intptr_t idx) const {
     ASSERT(idx == 0);
     return kUnboxedMint;
   }
 
   DECLARE_INSTRUCTION(BoxInteger)
   virtual CompileType ComputeType() const;
   virtual bool RecomputeType();
 
-  virtual void InferRange(Range* range);
+  virtual void InferRange();
 
   virtual bool AllowsCSE() const { return true; }
   virtual EffectSet Effects() const { return EffectSet::None(); }
   virtual EffectSet Dependencies() const { return EffectSet::None(); }
   virtual bool AttributesEqual(Instruction* other) const { return true; }
 
   virtual bool MayThrow() const { return false; }
 
  private:
   bool is_smi_;
@@ skipping 152 matching lines @@
     return (value()->Type()->ToCid() != kSmiCid)
         && (value()->Type()->ToCid() != kMintCid);
   }
 
   virtual Representation representation() const {
     return kUnboxedMint;
   }
 
   intptr_t deopt_id() const { return deopt_id_; }
 
-  virtual void InferRange(Range* range);
+  virtual void InferRange();
 
   DECLARE_INSTRUCTION(UnboxInteger)
   virtual CompileType ComputeType() const;
 
   virtual bool AllowsCSE() const { return true; }
   virtual EffectSet Effects() const { return EffectSet::None(); }
   virtual EffectSet Dependencies() const { return EffectSet::None(); }
   virtual bool AttributesEqual(Instruction* other) const { return true; }
 
   virtual bool MayThrow() const { return false; }
@@ skipping 1825 matching lines @@
     ASSERT((idx == 0) || (idx == 1));
     return kUnboxedMint;
   }
 
   virtual intptr_t DeoptimizationTarget() const {
     // Direct access since this instruction cannot deoptimize, and the deopt-id
     // was inherited from another instruction that could deoptimize.
     return deopt_id_;
   }
 
-  virtual void InferRange(Range* range);
+  virtual void InferRange();
 
   virtual Definition* Canonicalize(FlowGraph* flow_graph);
 
   DECLARE_INSTRUCTION(BinaryMintOp)
   virtual CompileType ComputeType() const;
 
   virtual bool AllowsCSE() const { return true; }
   virtual EffectSet Effects() const { return EffectSet::None(); }
   virtual EffectSet Dependencies() const { return EffectSet::None(); }
   virtual bool AttributesEqual(Instruction* other) const {
@@ skipping 53 matching lines @@
     ASSERT((idx == 0) || (idx == 1));
     return (idx == 0) ? kUnboxedMint : kTagged;
   }
 
   virtual intptr_t DeoptimizationTarget() const {
     // Direct access since this instruction cannot deoptimize, and the deopt-id
     // was inherited from another instruction that could deoptimize.
     return deopt_id_;
   }
 
-  virtual void InferRange(Range* range);
+  virtual void InferRange();
 
   DECLARE_INSTRUCTION(ShiftMintOp)
 
   virtual bool AllowsCSE() const { return true; }
   virtual EffectSet Effects() const { return EffectSet::None(); }
   virtual EffectSet Dependencies() const { return EffectSet::None(); }
   virtual bool AttributesEqual(Instruction* other) const {
     return op_kind() == other->AsShiftMintOp()->op_kind();
   }
 
@@ skipping 96 matching lines @@
 
   virtual bool CanDeoptimize() const;
 
   virtual bool AllowsCSE() const { return true; }
   virtual EffectSet Effects() const { return EffectSet::None(); }
   virtual EffectSet Dependencies() const { return EffectSet::None(); }
   virtual bool AttributesEqual(Instruction* other) const;
 
   void PrintTo(BufferFormatter* f) const;
 
-  virtual void InferRange(Range* range);
+  virtual void InferRange();
 
   virtual Definition* Canonicalize(FlowGraph* flow_graph);
 
   // Returns true if right is a non-zero Smi constant which absolute value is
   // a power of two.
   bool RightIsPowerOfTwoConstant() const;
 
   virtual bool MayThrow() const { return false; }
 
  private:
@@ skipping 1259 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_