Reenable elimination of strict equals when right side is true.

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 491 matching lines @@
   __ Bind(&non_null_compare);  // Receiver is not null.
   __ pushq(left);
   __ pushq(right);
   EmitEqualityAsPolymorphicCall(compiler, ic_data, locs, branch, kind,
                                 deopt_id, token_pos, try_index,
                                 locs.stack_bitmap());
   __ Bind(&done);
 }
 
 
-static intptr_t GetCid(const Value& v) {
-  // TODO(srdjan): CompileType does not give us correct type for optimizations.
-  // const AbstractType& type = AbstractType::Handle(v.CompileType());
-  // return Class::Handle(type.type_class()).id();
-  return kIllegalCid;
-}
-
-
 static void EmitSmiComparisonOp(FlowGraphCompiler* compiler,
                                 const LocationSummary& locs,
                                 Token::Kind kind,
                                 BranchInstr* branch,
                                 intptr_t deopt_id,
                                 intptr_t token_pos,
                                 intptr_t try_index) {
   Register left = locs.in(0).reg();
   Register right = locs.in(1).reg();
   const bool left_is_smi = (branch == NULL) ?
-      false : (GetCid(*branch->left()) == kSmiCid);
+      false : (branch->left()->ResultCid() == kSmiCid);
   const bool right_is_smi = (branch == NULL) ?
-      false : (GetCid(*branch->right()) == kSmiCid);
+      false : (branch->right()->ResultCid() == kSmiCid);
   if (!left_is_smi || !right_is_smi) {
     Register temp = locs.temp(0).reg();
     Label* deopt = compiler->AddDeoptStub(deopt_id,
                                           try_index,
                                           kDeoptSmiCompareSmi,
                                           left,
                                           right);
     __ movq(temp, left);
     __ orq(temp, right);
     __ testq(temp, Immediate(kSmiTagMask));
@@ skipping 915 matching lines @@
   }
 }
 
 
 static void EmitSmiBinaryOp(FlowGraphCompiler* compiler, BinaryOpComp* comp) {
   Register left = comp->locs()->in(0).reg();
   Register right = comp->locs()->in(1).reg();
   Register result = comp->locs()->out().reg();
   Register temp = comp->locs()->temp(0).reg();
   ASSERT(left == result);
-  const bool left_is_smi = (GetCid(*comp->left()) == kSmiCid);
-  const bool right_is_smi = (GetCid(*comp->right()) == kSmiCid);
+  const bool left_is_smi = comp->left()->ResultCid() == kSmiCid;
+  const bool right_is_smi = comp->right()->ResultCid() == kSmiCid;
   bool can_deopt;
   switch (comp->op_kind()) {
     case Token::kBIT_AND:
     case Token::kBIT_OR:
     case Token::kBIT_XOR:
       can_deopt = !(right_is_smi && left_is_smi);
       break;
     default:
       can_deopt = true;
   }
@@ skipping 416 matching lines @@
     // Result is in RAX.
     ASSERT(result != temp);
     __ movq(result, RAX);
     __ popq(temp);
     __ movsd(XMM0, FieldAddress(temp, Double::value_offset()));
     __ DoubleNegate(XMM0);
     __ movsd(FieldAddress(result, Double::value_offset()), XMM0);
   } else {
     UNREACHABLE();
   }
+  ASSERT(ResultCid() == kDoubleCid);
 }
 
 
 LocationSummary* DoubleToDoubleComp::MakeLocationSummary() const {
   const intptr_t kNumInputs = 1;
   const intptr_t kNumTemps = 0;
   LocationSummary* locs =
       new LocationSummary(kNumInputs, kNumTemps, LocationSummary::kNoCall);
   locs->set_in(0, Location::RequiresRegister());
   locs->set_out(Location::SameAsFirstInput());
@@ skipping 232 matching lines @@
                                  locs()->stack_bitmap());
   __ CompareObject(RAX, compiler->bool_true());
   EmitBranchOnCondition(compiler, branch_condition);
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64