Allow equality operation on mixed double/smi arguments.

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 2679 matching lines @@
   InstanceCallInstr* instance_call_;
   const ICData& ic_data_;
   const bool with_checks_;
 
   DISALLOW_COPY_AND_ASSIGN(PolymorphicInstanceCallInstr);
 };
 
 
 class ComparisonInstr : public TemplateDefinition<2> {
  public:
-  ComparisonInstr(intptr_t token_pos,
-                  Token::Kind kind,
-                  Value* left,
-                  Value* right)
-      : token_pos_(token_pos), kind_(kind) {
-    SetInputAt(0, left);
-    SetInputAt(1, right);
-  }
-
   Value* left() const { return inputs_[0]; }
   Value* right() const { return inputs_[1]; }
 
   virtual ComparisonInstr* AsComparison() { return this; }
 
   intptr_t token_pos() const { return token_pos_; }
   Token::Kind kind() const { return kind_; }
 
   virtual void EmitBranchCode(FlowGraphCompiler* compiler,
                               BranchInstr* branch) = 0;
 
   void SetDeoptId(intptr_t deopt_id) {
     deopt_id_ = deopt_id;
   }
 
+  // Operation class id is computed from collected ICData.
+  void set_operation_cid(intptr_t value) { operation_cid_ = value; }
+  intptr_t operation_cid() const { return operation_cid_; }
+
  protected:
+  ComparisonInstr(intptr_t token_pos,
+                  Token::Kind kind,
+                  Value* left,
+                  Value* right)
+      : token_pos_(token_pos), kind_(kind), operation_cid_(kIllegalCid) {
+    SetInputAt(0, left);
+    SetInputAt(1, right);
+  }
+
   intptr_t token_pos_;
   Token::Kind kind_;
+
+ private:
+  intptr_t operation_cid_;  // Set by optimizer.
+
+  DISALLOW_COPY_AND_ASSIGN(ComparisonInstr);
 };
 
 
 // Inlined functions from class BranchInstr that forward to their comparison.
 inline intptr_t BranchInstr::ArgumentCount() const {
   return comparison()->ArgumentCount();
 }
 
 
 inline intptr_t BranchInstr::InputCount() const {
@@ skipping 96 matching lines @@
 
 class EqualityCompareInstr : public ComparisonInstr {
  public:
   EqualityCompareInstr(intptr_t token_pos,
                        Token::Kind kind,
                        Value* left,
                        Value* right,
                        const Array& ic_data_array)
       : ComparisonInstr(token_pos, kind, left, right),
         ic_data_(GetICData(ic_data_array)),
-        unary_ic_data_(NULL),
-        receiver_class_id_(kIllegalCid) {
+        unary_ic_data_(NULL) {
     ASSERT((kind == Token::kEQ) || (kind == Token::kNE));
     if (HasICData()) {
       unary_ic_data_ = &ICData::ZoneHandle(ic_data_->AsUnaryClassChecks());
     }
   }
 
   DECLARE_INSTRUCTION(EqualityCompare)
   virtual CompileType ComputeType() const;
   virtual bool RecomputeType();
 
   const ICData* ic_data() const { return ic_data_; }
   bool HasICData() const {
     return (ic_data() != NULL) && !ic_data()->IsNull();
   }
   void set_ic_data(const ICData* value) {
     ic_data_ = value;
     if (HasICData()) {
       unary_ic_data_ = &ICData::ZoneHandle(ic_data_->AsUnaryClassChecks());
     }
   }
 
-  // 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_; }
-
   bool IsInlinedNumericComparison() const {
-    return (receiver_class_id() == kDoubleCid)
-        || (receiver_class_id() == kMintCid)
-        || (receiver_class_id() == kSmiCid);
+    return (operation_cid() == kDoubleCid)
+        || (operation_cid() == kMintCid)
+        || (operation_cid() == kSmiCid);
   }
 
   bool IsCheckedStrictEqual() const;
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const {
     return !IsInlinedNumericComparison();
   }
 
   virtual void EmitBranchCode(FlowGraphCompiler* compiler,
                               BranchInstr* branch);
 
   virtual intptr_t DeoptimizationTarget() const {
     return GetDeoptId();
   }
 
   virtual Representation RequiredInputRepresentation(intptr_t idx) const {
     ASSERT((idx == 0) || (idx == 1));
-    if (receiver_class_id() == kDoubleCid) return kUnboxedDouble;
-    if (receiver_class_id() == kMintCid) return kUnboxedMint;
+    if (operation_cid() == kDoubleCid) return kUnboxedDouble;
+    if (operation_cid() == kMintCid) return kUnboxedMint;
     return kTagged;
   }
 
   bool IsPolymorphic() const;
 
   virtual EffectSet Effects() const {
     return IsInlinedNumericComparison() ? EffectSet::None() : EffectSet::All();
   }
 
   virtual bool MayThrow() const {
     return !IsInlinedNumericComparison() && !IsCheckedStrictEqual();
   }
 
  private:
   const ICData* ic_data_;
   ICData* unary_ic_data_;
-  intptr_t receiver_class_id_;  // Set by optimizer.
 
   DISALLOW_COPY_AND_ASSIGN(EqualityCompareInstr);
 };
 
 
 class RelationalOpInstr : public ComparisonInstr {
  public:
   RelationalOpInstr(intptr_t token_pos,
                     Token::Kind kind,
                     Value* left,
                     Value* right,
                     const Array& ic_data_array)
       : ComparisonInstr(token_pos, kind, left, right),
-        ic_data_(GetICData(ic_data_array)),
-        operands_class_id_(kIllegalCid) {
+        ic_data_(GetICData(ic_data_array)) {
     ASSERT(Token::IsRelationalOperator(kind));
   }
 
   DECLARE_INSTRUCTION(RelationalOp)
   virtual CompileType ComputeType() const;
   virtual bool RecomputeType();
 
   const ICData* ic_data() const { return ic_data_; }
   bool HasICData() const {
     return (ic_data() != NULL) && !ic_data()->IsNull();
   }
   void set_ic_data(const ICData* value) { ic_data_ = value; }
 
-  // TODO(srdjan): instead of class-id pass an enum that can differentiate
-  // 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_; }
-
   bool IsInlinedNumericComparison() const {
-    return (operands_class_id() == kDoubleCid)
-        || (operands_class_id() == kMintCid)
-        || (operands_class_id() == kSmiCid);
+    return (operation_cid() == kDoubleCid)
+        || (operation_cid() == kMintCid)
+        || (operation_cid() == kSmiCid);
   }
 
   virtual void PrintOperandsTo(BufferFormatter* f) const;
 
   virtual bool CanDeoptimize() const {
     return !IsInlinedNumericComparison();
   }
 
   virtual void EmitBranchCode(FlowGraphCompiler* compiler,
                               BranchInstr* branch);
 
 
   virtual intptr_t DeoptimizationTarget() const {
     return GetDeoptId();
   }
 
   virtual Representation RequiredInputRepresentation(intptr_t idx) const {
     ASSERT((idx == 0) || (idx == 1));
-    if (operands_class_id() == kDoubleCid) return kUnboxedDouble;
-    if (operands_class_id() == kMintCid) return kUnboxedMint;
+    if (operation_cid() == kDoubleCid) return kUnboxedDouble;
+    if (operation_cid() == kMintCid) return kUnboxedMint;
     return kTagged;
   }
 
   virtual EffectSet Effects() const {
     return IsInlinedNumericComparison() ? EffectSet::None() : EffectSet::All();
   }
 
   virtual bool MayThrow() const { return !IsInlinedNumericComparison(); }
 
  private:
   const ICData* ic_data_;
-  intptr_t operands_class_id_;  // class id of both operands.
 
   DISALLOW_COPY_AND_ASSIGN(RelationalOpInstr);
 };
 
 
 // TODO(vegorov): ComparisonInstr should be switched to use IfTheElseInstr for
 // materialization of true and false constants.
 class IfThenElseInstr : public TemplateDefinition<2> {
  public:
   IfThenElseInstr(Token::Kind kind,
@@ skipping 3567 matching lines @@
   ForwardInstructionIterator* current_iterator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(FlowGraphVisitor);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_INTERMEDIATE_LANGUAGE_H_