Restore changes lost in merge for r8626 (equality operation).

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 209 matching lines @@
     }
     return locs;
   }
   UNREACHABLE();
   return NULL;
 }
 
 
 static void EmitSmiEqualityCompare(FlowGraphCompiler* compiler,
                                    EqualityCompareComp* comp) {
-  // TODO(srdjan): Should we always include NULL test (common case)?
   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();
   Label* deopt = compiler->AddDeoptStub(comp->cid(),
                                         comp->token_index(),
                                         comp->try_index(),
                                         kDeoptSmiCompareSmis,
                                         left,
                                         right);
+  // TODO(srdjan): Should we always include NULL test (common case)?
   __ movq(temp, left);
   __ orq(temp, right);
   __ testq(temp, Immediate(kSmiTagMask));
   __ j(NOT_ZERO, deopt);
   __ cmpq(left, right);
   if (comp->is_fused_with_branch()) {
     comp->fused_with_branch()->EmitBranchOnCondition(compiler, EQUAL);
   } else {
+    Register result = comp->locs()->out().reg();
     Label load_true, done;
     __ j(EQUAL, &load_true, Assembler::kNearJump);
     __ LoadObject(result, compiler->bool_false());
     __ jmp(&done, Assembler::kNearJump);
     __ Bind(&load_true);
     __ LoadObject(result, compiler->bool_true());
     __ Bind(&done);
   }
 }
 
@@ skipping 18 matching lines @@
     __ LoadObject(result, compiler->bool_false());
     __ jmp(&done, Assembler::kNearJump);
     __ Bind(&load_true);
     __ LoadObject(result, compiler->bool_true());
   }
   __ jmp(&done);
 
   __ Bind(&non_null_compare);
   __ pushq(left);
   __ pushq(right);
+  compiler->AddCurrentDescriptor(PcDescriptors::kDeopt,
+                                 comp->cid(),
+                                 comp->token_index(),
+                                 comp->try_index());
   const String& operator_name = String::ZoneHandle(String::NewSymbol("=="));
   const int kNumberOfArguments = 2;
   const Array& kNoArgumentNames = Array::Handle();
-  const int kNumArgumentsChecked = 1;
+  const int kNumArgumentsChecked = 2;
 
   compiler->GenerateInstanceCall(comp->cid(),
                                  comp->token_index(),
                                  comp->try_index(),
                                  operator_name,
                                  kNumberOfArguments,
                                  kNoArgumentNames,
                                  kNumArgumentsChecked);
   ASSERT(comp->is_fused_with_branch() || (comp->locs()->out().reg() == RAX));
 
@@ skipping 1293 matching lines @@
   __ cvtsi2sd(XMM0, value);
   __ movsd(FieldAddress(result, Double::value_offset()), XMM0);
 }
 
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64