Allow equality operation on mixed double/smi arguments.

runtime/vm/intermediate_language_x64.cc

Index: runtime/vm/intermediate_language_x64.cc
===================================================================
--- runtime/vm/intermediate_language_x64.cc	(revision 25478)
+++ runtime/vm/intermediate_language_x64.cc	(working copy)
@@ -169,7 +169,7 @@
   if (!(comparison->IsStrictCompare() &&
         !comparison->AsStrictCompare()->needs_number_check()) &&
       !(comparison->IsEqualityCompare() &&
-        (comparison->AsEqualityCompare()->receiver_class_id() == kSmiCid))) {
+        (comparison->AsEqualityCompare()->operation_cid() == kSmiCid))) {
     return false;
   }
 
@@ -396,7 +396,7 @@
 
 LocationSummary* EqualityCompareInstr::MakeLocationSummary() const {
   const intptr_t kNumInputs = 2;
-  if (receiver_class_id() == kDoubleCid) {
+  if (operation_cid() == kDoubleCid) {
     const intptr_t kNumTemps =  0;
     LocationSummary* locs =
         new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
@@ -405,7 +405,7 @@
     locs->set_out(Location::RequiresRegister());
     return locs;
   }
-  if (receiver_class_id() == kSmiCid) {
+  if (operation_cid() == kSmiCid) {
     const intptr_t kNumTemps = 0;
     LocationSummary* locs =
         new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
@@ -841,12 +841,12 @@
 void EqualityCompareInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   ASSERT((kind() == Token::kEQ) || (kind() == Token::kNE));
   BranchInstr* kNoBranch = NULL;
-  if (receiver_class_id() == kSmiCid) {
+  if (operation_cid() == kSmiCid) {
     // Deoptimizes if both arguments not Smi.
     EmitSmiComparisonOp(compiler, *locs(), kind(), kNoBranch);
     return;
   }
-  if (receiver_class_id() == kDoubleCid) {
+  if (operation_cid() == kDoubleCid) {
     // Deoptimizes if both arguments are Smi, or if none is Double or Smi.
     EmitDoubleComparisonOp(compiler, *locs(), kind(), kNoBranch);
     return;
@@ -878,12 +878,12 @@
 void EqualityCompareInstr::EmitBranchCode(FlowGraphCompiler* compiler,
                                           BranchInstr* branch) {
   ASSERT((kind() == Token::kNE) || (kind() == Token::kEQ));
-  if (receiver_class_id() == kSmiCid) {
+  if (operation_cid() == kSmiCid) {
     // Deoptimizes if both arguments not Smi.
     EmitSmiComparisonOp(compiler, *locs(), kind(), branch);
     return;
   }
-  if (receiver_class_id() == kDoubleCid) {
+  if (operation_cid() == kDoubleCid) {
     // Deoptimizes if both arguments are Smi, or if none is Double or Smi.
     EmitDoubleComparisonOp(compiler, *locs(), kind(), branch);
     return;
@@ -920,14 +920,14 @@
 LocationSummary* RelationalOpInstr::MakeLocationSummary() const {
   const intptr_t kNumInputs = 2;
   const intptr_t kNumTemps = 0;
-  if (operands_class_id() == kDoubleCid) {
+  if (operation_cid() == kDoubleCid) {
     LocationSummary* summary =
         new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
     summary->set_in(0, Location::RequiresFpuRegister());
     summary->set_in(1, Location::RequiresFpuRegister());
     summary->set_out(Location::RequiresRegister());
     return summary;
-  } else if (operands_class_id() == kSmiCid) {
+  } else if (operation_cid() == kSmiCid) {
     LocationSummary* summary =
         new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
     summary->set_in(0, Location::RegisterOrConstant(left()));
@@ -950,11 +950,11 @@
 
 
 void RelationalOpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
-  if (operands_class_id() == kSmiCid) {
+  if (operation_cid() == kSmiCid) {
     EmitSmiComparisonOp(compiler, *locs(), kind(), NULL);
     return;
   }
-  if (operands_class_id() == kDoubleCid) {
+  if (operation_cid() == kDoubleCid) {
     EmitDoubleComparisonOp(compiler, *locs(), kind(), NULL);
     return;
   }
@@ -1024,11 +1024,11 @@
 
 void RelationalOpInstr::EmitBranchCode(FlowGraphCompiler* compiler,
                                        BranchInstr* branch) {
-  if (operands_class_id() == kSmiCid) {
+  if (operation_cid() == kSmiCid) {
     EmitSmiComparisonOp(compiler, *locs(), kind(), branch);
     return;
   }
-  if (operands_class_id() == kDoubleCid) {
+  if (operation_cid() == kDoubleCid) {
     EmitDoubleComparisonOp(compiler, *locs(), kind(), branch);
     return;
   }