Fix deoptimzation bug in hoisting smi operation out of loops.

runtime/vm/intermediate_language_ia32.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_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/intermediate_language.h"
 
 #include "lib/error.h"
@@ skipping 1571 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 int32_t imm =
         reinterpret_cast<int32_t>(constant.raw());
     switch (op_kind()) {
       case Token::kADD:
@@ skipping 152 matching lines @@
       __ jmp(&done);
       {
         __ Bind(&call_method);
         Function& target = Function::ZoneHandle(
             ic_data()->GetTargetForReceiverClassId(kSmiCid));
         ASSERT(!target.IsNull());
         const intptr_t kArgumentCount = 2;
         __ pushl(temp);
         __ pushl(right);
         compiler->GenerateStaticCall(
             instance_call()->deopt_id(),

[Vyacheslav Egorov (Google), 2012/10/24 14:53:00]

This place should be also adjusted accordingly. And covered with a test.

[Florian Schneider, 2012/10/24 18:00:22]

Done.

             instance_call()->token_pos(),
             target,
             kArgumentCount,
             Array::Handle(),  // No argument names.
             locs());
         ASSERT(result == EAX);
       }
       __ Bind(&done);
       break;
     }
@@ skipping 807 matching lines @@
   __ pcmpeqq(XMM0, XMM0);  // Generate all 1's.
   __ pxor(value, XMM0);
 }
 
 
 }  // namespace dart
 
 #undef __
 
 #endif  // defined TARGET_ARCH_X64