Reenable elimination of strict equals when right side is true.

runtime/vm/intermediate_language.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_INTERMEDIATE_LANGUAGE_H_
 #define VM_INTERMEDIATE_LANGUAGE_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 138 matching lines @@
   // Returns true, if this computation can deoptimize.
   virtual bool CanDeoptimize() const  = 0;
 
   // Optimize this computation. Returns a replacement for the instruction
   // that wraps this computation or NULL if nothing to replace.
   virtual Definition* TryReplace(BindInstr* instr) { return NULL; }
 
   // Compile time type of the computation, which typically depends on the
   // compile time types (and possibly propagated types) of its inputs.
   virtual RawAbstractType* CompileType() const = 0;
-  // TODO(srdjan): Make this abstract so that it gets correctly implemented
-  // in all computations.
   virtual intptr_t ResultCid() const { return kDynamicCid; }
 
   // Mutate assigned_vars to add the local variable index for all
   // frame-allocated locals assigned to by the computation.
   virtual void RecordAssignedVars(BitVector* assigned_vars,
                                   intptr_t fixed_parameter_count);
 
   virtual const char* DebugName() const = 0;
 
   // Printing support. These functions are sometimes overridden for custom
@@ skipping 126 matching lines @@
 
 class Value : public TemplateComputation<0> {
  public:
   Value() { }
 
   // Returns true if the value represents a constant.
   virtual bool BindsToConstant() const = 0;
 
   // Returns true if the value represents constant null.
   virtual bool BindsToConstantNull() const = 0;
+  // Assert if BindsToConstant() is false, otherwise returns constant.

[regis, 2012/08/16 21:43:52]

Missing empty line. Or group with BindsToConstant() above and not with
BindsToConstantNull().

[srdjan, 2012/08/16 22:11:06]

Added empty line.

+  virtual const Object& BoundConstant() const = 0;
 
   // Reminder: The type of the constant null is the bottom type, which is more
   // specific than any type.
   bool CompileTypeIsMoreSpecificThan(const AbstractType& dst_type) const;
 
   virtual void RemoveFromUseList() = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Value);
 };
@@ skipping 36 matching lines @@
  public:
   explicit UseVal(Definition* definition);
 
   DECLARE_VALUE(Use)
 
   inline Definition* definition() const;
   void SetDefinition(Definition* definition);
 
   // Returns true if the value represents a constant.
   virtual bool BindsToConstant() const;
+  virtual const Object& BoundConstant() const;
 
   // Returns true if the value represents constant null.
   virtual bool BindsToConstantNull() const;
 
   virtual bool CanDeoptimize() const { return false; }
 
   UseVal* next_use() const { return next_use_; }
   UseVal* previous_use() const { return previous_use_; }
   virtual void RemoveFromUseList();
   virtual void RemoveInputUses() { RemoveFromUseList(); }
@@ skipping 19 matching lines @@
     ASSERT(value.IsZoneHandle());
     ASSERT(value.IsSmi() || value.IsOld());
   }
 
   DECLARE_VALUE(Constant)
 
   const Object& value() const { return value_; }
 
   // Returns true if the value represents a constant.
   virtual bool BindsToConstant() const { return true; }
+  virtual const Object& BoundConstant() const { return value(); }
 
   // Returns true if the value represents constant null.
   virtual bool BindsToConstantNull() const { return value().IsNull(); }
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual void RemoveFromUseList() { }
 
   virtual intptr_t ResultCid() const;
 
@@ skipping 86 matching lines @@
     return is_eliminated_;
   }
   void eliminate() {
     ASSERT(!is_eliminated_);
     is_eliminated_ = true;
   }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
-
   virtual intptr_t ResultCid() const { return kBoolCid; }
 
  private:
   const intptr_t token_pos_;
   const intptr_t try_index_;
   bool is_eliminated_;
 
   DISALLOW_COPY_AND_ASSIGN(AssertBooleanComp);
 };
 
@@ skipping 175 matching lines @@
     ASSERT((kind == Token::kEQ_STRICT) || (kind == Token::kNE_STRICT));
   }
 
   DECLARE_COMPUTATION(StrictCompare)
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
 
   virtual Definition* TryReplace(BindInstr* instr);
-
   virtual intptr_t ResultCid() const { return kBoolCid; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StrictCompareComp);
 };
 
 
 class EqualityCompareComp : public ComparisonComp {
  public:
   EqualityCompareComp(intptr_t token_pos,
@@ skipping 13 matching lines @@
   intptr_t token_pos() const { return token_pos_; }
   intptr_t try_index() const { return try_index_; }
 
   // Receiver class id is computed from collected ICData.
   void set_receiver_class_id(intptr_t value) { receiver_class_id_ = value; }
   intptr_t receiver_class_id() const { return receiver_class_id_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return true; }
-
-  virtual intptr_t ResultCid() const { return kBoolCid; }
+  virtual intptr_t ResultCid() const;
 
  private:
   const intptr_t token_pos_;
   const intptr_t try_index_;
   intptr_t receiver_class_id_;  // Set by optimizer.
 
   DISALLOW_COPY_AND_ASSIGN(EqualityCompareComp);
 };
 
 
@@ skipping 20 matching lines @@
   // between boxed and unboxed doubles and integers.
   void set_operands_class_id(intptr_t value) {
     operands_class_id_ = value;
   }
 
   intptr_t operands_class_id() const { return operands_class_id_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return true; }
-
-  virtual intptr_t ResultCid() const { return kBoolCid; }
+  virtual intptr_t ResultCid() const;
 
  private:
   const intptr_t token_pos_;
   const intptr_t try_index_;
   intptr_t operands_class_id_;  // class id of both operands.
 
   DISALLOW_COPY_AND_ASSIGN(RelationalOpComp);
 };
 
 
@@ skipping 365 matching lines @@
   Value* instantiator_type_arguments() const { return inputs_[2]; }
 
   bool negate_result() const { return negate_result_; }
   const AbstractType& type() const { return type_; }
   intptr_t token_pos() const { return token_pos_; }
   intptr_t try_index() const { return try_index_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const { return false; }
+  virtual intptr_t ResultCid() const { return kBoolCid; }
 
  private:
   const intptr_t token_pos_;
   const intptr_t try_index_;
   Value* value_;
   Value* instantiator_;
   Value* type_arguments_;
   const AbstractType& type_;
   const bool negate_result_;
 
@@ skipping 432 matching lines @@
 
   OperandsType operands_type() const { return operands_type_; }
 
   InstanceCallComp* instance_call() const { return instance_call_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   DECLARE_COMPUTATION(BinaryOp)
 
   virtual bool CanDeoptimize() const { return true; }
+  virtual intptr_t ResultCid() const;
 
  private:
   const Token::Kind op_kind_;
   const OperandsType operands_type_;
   InstanceCallComp* instance_call_;
 
   DISALLOW_COPY_AND_ASSIGN(BinaryOpComp);
 };
 
 
 class DoubleBinaryOpComp : public TemplateComputation<0> {
  public:
   DoubleBinaryOpComp(Token::Kind op_kind, InstanceCallComp* instance_call)
       : op_kind_(op_kind), instance_call_(instance_call) { }
 
   Token::Kind op_kind() const { return op_kind_; }
 
   InstanceCallComp* instance_call() const { return instance_call_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   DECLARE_CALL_COMPUTATION(DoubleBinaryOp)
 
   virtual intptr_t ArgumentCount() const { return 2; }
 
   virtual bool CanDeoptimize() const { return true; }
+  virtual intptr_t ResultCid() const;
 
  private:
   const Token::Kind op_kind_;
   InstanceCallComp* instance_call_;
 
   DISALLOW_COPY_AND_ASSIGN(DoubleBinaryOpComp);
 };
 
 
 // Handles both Smi operations: BIT_OR and NEGATE.
@@ skipping 10 matching lines @@
   Value* value() const { return inputs_[0]; }
   Token::Kind op_kind() const { return op_kind_; }
 
   InstanceCallComp* instance_call() const { return instance_call_; }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   DECLARE_COMPUTATION(UnarySmiOp)
 
   virtual bool CanDeoptimize() const { return true; }
+  virtual intptr_t ResultCid() const { return kSmiCid; }
 
  private:
   const Token::Kind op_kind_;
   InstanceCallComp* instance_call_;
 
   DISALLOW_COPY_AND_ASSIGN(UnarySmiOpComp);
 };
 
 
 // Handles non-Smi NEGATE operations
@@ skipping 49 matching lines @@
     inputs_[0] = value;
   }
 
   Value* value() const { return inputs_[0]; }
 
   InstanceCallComp* instance_call() const { return instance_call_; }
 
   DECLARE_COMPUTATION(DoubleToDouble)
 
   virtual bool CanDeoptimize() const { return true; }
+  virtual intptr_t ResultCid() const { return kDoubleCid; }
 
  private:
   InstanceCallComp* instance_call_;
 
   DISALLOW_COPY_AND_ASSIGN(DoubleToDoubleComp);
 };
 
 
 class SmiToDoubleComp : public TemplateComputation<0> {
  public:
   explicit SmiToDoubleComp(InstanceCallComp* instance_call)
       : instance_call_(instance_call) { }
 
   InstanceCallComp* instance_call() const { return instance_call_; }
 
   DECLARE_CALL_COMPUTATION(SmiToDouble)
 
   virtual intptr_t ArgumentCount() const { return 1; }
 
   virtual bool CanDeoptimize() const { return true; }
+  virtual intptr_t ResultCid() const { return kDoubleCid; }
 
  private:
   InstanceCallComp* instance_call_;
 
   DISALLOW_COPY_AND_ASSIGN(SmiToDoubleComp);
 };
 
 
 #undef DECLARE_COMPUTATION
 
@@ skipping 1186 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_