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

runtime/vm/intermediate_language_ia32.cc

Index: runtime/vm/intermediate_language_ia32.cc
===================================================================
--- runtime/vm/intermediate_language_ia32.cc	(revision 8626)
+++ runtime/vm/intermediate_language_ia32.cc	(working copy)
@@ -220,8 +220,6 @@
                                    EqualityCompareComp* comp) {
   Register left = comp->locs()->in(0).reg();
   Register right = comp->locs()->in(1).reg();
-  // TODO(srdjan): Should we always include NULL test (common case)?
-  Register result = comp->locs()->out().reg();
   Register temp = comp->locs()->temp(0).reg();
   Label* deopt = compiler->AddDeoptStub(comp->cid(),
                                         comp->token_index(),
@@ -229,6 +227,7 @@
                                         kDeoptSmiCompareSmis,
                                         left,
                                         right);
+  // TODO(srdjan): Should we always include NULL test (common case)?
   __ movl(temp, left);
   __ orl(temp, right);
   __ testl(temp, Immediate(kSmiTagMask));
@@ -237,6 +236,7 @@
   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());
@@ -275,10 +275,14 @@
   __ Bind(&non_null_compare);
   __ pushl(left);
   __ pushl(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(),