Add explicit smi-checks to smi comparisons.

runtime/vm/intermediate_language_x64.cc

 // 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.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/intermediate_language.h"
 
 #include "lib/error.h"
@@ skipping 231 matching lines @@
       UNREACHABLE();
       return OVERFLOW;
   }
 }
 
 
 LocationSummary* EqualityCompareComp::MakeLocationSummary() const {
   const intptr_t kNumInputs = 2;
   const bool is_checked_strict_equal =
       HasICData() && ic_data()->AllTargetsHaveSameOwner(kInstanceCid);
-  if ((receiver_class_id() == kSmiCid) ||
-      (receiver_class_id() == kDoubleCid) ||
-      is_checked_strict_equal) {
+  if ((receiver_class_id() == kSmiCid) || is_checked_strict_equal) {
     const intptr_t kNumTemps = 1;
     LocationSummary* locs =
         new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
     locs->set_in(0, Location::RequiresRegister());
     locs->set_in(1, Location::RequiresRegister());
     locs->set_temp(0, Location::RequiresRegister());
     locs->set_out(Location::RequiresRegister());
     return locs;
   }
+  if (receiver_class_id() == kDoubleCid) {
+    const intptr_t kNumTemps = 2;
+    LocationSummary* locs =
+        new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
+    locs->set_in(0, Location::RequiresRegister());
+    locs->set_in(1, Location::RequiresRegister());
+    locs->set_out(Location::RequiresRegister());
+    locs->set_temp(0, Location::RequiresRegister());
+    locs->set_temp(1, Location::XmmRegisterLocation(XMM1));
+    return locs;
+  }
   if (HasICData() && (ic_data()->NumberOfChecks() > 0)) {
     const intptr_t kNumTemps = 1;
     LocationSummary* locs =
         new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kCall);
     locs->set_in(0, Location::RegisterLocation(RCX));
     locs->set_in(1, Location::RegisterLocation(RDX));
     locs->set_temp(0, Location::RegisterLocation(RBX));
     locs->set_out(Location::RegisterLocation(RAX));
     return locs;
   }
@@ skipping 259 matching lines @@
 }
 
 
 static void EmitSmiComparisonOp(FlowGraphCompiler* compiler,
                                 const LocationSummary& locs,
                                 Token::Kind kind,
                                 BranchInstr* branch,
                                 intptr_t deopt_id) {
   Register left = locs.in(0).reg();
   Register right = locs.in(1).reg();
-  const bool left_is_smi = (branch == NULL) ?
-      false : (branch->computation()->left()->ResultCid() == kSmiCid);
-  const bool right_is_smi = (branch == NULL) ?
-      false : (branch->computation()->right()->ResultCid() == kSmiCid);
-  // TODO(fschneider): Move smi smi checks outside this instruction.
-  if (!left_is_smi || !right_is_smi) {
-    Register temp = locs.temp(0).reg();
-    Label* deopt = compiler->AddDeoptStub(deopt_id, kDeoptSmiCompareSmi);
-    __ movq(temp, left);
-    __ orq(temp, right);
-    __ testq(temp, Immediate(kSmiTagMask));
-    __ j(NOT_ZERO, deopt);
-  }
 
   Condition true_condition = TokenKindToSmiCondition(kind);
   __ cmpq(left, right);
 
   if (branch != NULL) {
     branch->EmitBranchOnCondition(compiler, true_condition);
   } else {
     Register result = locs.out().reg();
     Label done, is_true;
     __ j(true_condition, &is_true);
@@ skipping 118 matching lines @@
                              Token::kEQ,  // kNE reverse occurs at branch.
                              locs());
   Condition branch_condition = (kind() == Token::kNE) ? NOT_EQUAL : EQUAL;
   __ CompareObject(RAX, compiler->bool_true());
   branch->EmitBranchOnCondition(compiler, branch_condition);
 }
 
 
 LocationSummary* RelationalOpComp::MakeLocationSummary() const {
   const intptr_t kNumInputs = 2;
-  if (operands_class_id() == kSmiCid || operands_class_id() == kDoubleCid) {
+  if (operands_class_id() == kSmiCid) {
     const intptr_t kNumTemps = 1;
     LocationSummary* summary =
         new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
     summary->set_in(0, Location::RequiresRegister());
     summary->set_in(1, Location::RequiresRegister());
     summary->set_out(Location::RequiresRegister());
     summary->set_temp(0, Location::RequiresRegister());
     return summary;
   }
+  if (operands_class_id() == kDoubleCid) {
+    const intptr_t kNumTemps = 2;
+    LocationSummary* summary =
+        new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
+    summary->set_in(0, Location::RequiresRegister());
+    summary->set_in(1, Location::RequiresRegister());
+    summary->set_out(Location::RequiresRegister());
+    summary->set_temp(0, Location::RequiresRegister());
+    summary->set_temp(1, Location::XmmRegisterLocation(XMM1));
+    return summary;
+  }
   const intptr_t kNumTemps = 0;
   LocationSummary* locs =
       new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kCall);
   // Pick arbitrary fixed input registers because this is a call.
   locs->set_in(0, Location::RegisterLocation(RAX));
   locs->set_in(1, Location::RegisterLocation(RCX));
   locs->set_out(Location::RegisterLocation(RAX));
   return locs;
 }
 
@@ skipping 1507 matching lines @@
   }
   __ j(ABOVE_EQUAL, deopt);
 }
 
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64