Fix deoptimzation bug in hoisting smi operation out of loops.

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 1542 matching lines @@
   }
 }
 
 
 void BinarySmiOpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register left = locs()->in(0).reg();
   Register result = locs()->out().reg();
   ASSERT(left == result);
   Label* deopt = NULL;
   if (CanDeoptimize()) {
-    deopt = compiler->AddDeoptStub(instance_call()->deopt_id(),
+    deopt = compiler->AddDeoptStub(deopt_id(),
                                    kDeoptBinarySmiOp);
   }
 
   if (locs()->in(1).IsConstant()) {
     const Object& constant = locs()->in(1).constant();
     ASSERT(constant.IsSmi());
     const int64_t imm =
         reinterpret_cast<int64_t>(constant.raw());
     switch (op_kind()) {
       case Token::kADD: {
@@ skipping 146 matching lines @@
       __ jmp(&done);
       {
         __ Bind(&call_method);
         Function& target = Function::ZoneHandle(
             ic_data()->GetTargetForReceiverClassId(kSmiCid));
         ASSERT(!target.IsNull());
         const intptr_t kArgumentCount = 2;
         __ pushq(temp);
         __ pushq(right);
         compiler->GenerateStaticCall(
-            instance_call()->deopt_id(),
+            deopt_id(),
             instance_call()->token_pos(),
             target,
             kArgumentCount,
             Array::Handle(),  // No argument names.
             locs());
         ASSERT(result == RAX);
       }
       __ Bind(&done);
       break;
     }
@@ skipping 193 matching lines @@
   summary->set_out(Location::SameAsFirstInput());
   return summary;
 }
 
 
 void UnarySmiOpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   Register value = locs()->in(0).reg();
   ASSERT(value == locs()->out().reg());
   switch (op_kind()) {
     case Token::kNEGATE: {
-      Label* deopt = compiler->AddDeoptStub(instance_call()->deopt_id(),
+      Label* deopt = compiler->AddDeoptStub(deopt_id(),
                                             kDeoptUnaryOp);
       __ negq(value);
       __ j(OVERFLOW, deopt);
       break;
     }
     case Token::kBIT_NOT:
       __ notq(value);
       __ andq(value, Immediate(~kSmiTagMask));  // Remove inverted smi-tag.
       break;
     default:
@@ skipping 352 matching lines @@
 
 void ShiftMintOpInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   UNIMPLEMENTED();
 }
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64