Update stack map computation to match the way XMM registers are spilled on the slow path.

runtime/vm/flow_graph_compiler.cc

 // Copyright (c) 2013, 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_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/cha.h"
 #include "vm/dart_entry.h"
@@ skipping 397 matching lines @@
     if (!locs->always_calls()) {
       RegisterSet* regs = locs->live_registers();
       if (regs->fpu_regs_count() > 0) {
         // Denote FPU registers with 0 bits in the stackmap.  Based on the
         // assumption that there are normally few live FPU registers, this
         // encoding is simpler and roughly as compact as storing a separate
         // count of FPU registers.
         //
         // FPU registers have the highest register number at the highest
         // address (i.e., first in the stackmap).
+        const intptr_t kFpuRegisterSpillFactor = kFpuRegisterSize / kWordSize;
         for (intptr_t i = kNumberOfFpuRegisters - 1; i >= 0; --i) {
           FpuRegister reg = static_cast<FpuRegister>(i);
           if (regs->ContainsFpuRegister(reg)) {
-            for (intptr_t j = 0;
-                 j < FlowGraphAllocator::kDoubleSpillSlotFactor;
-                 ++j) {
+            for (intptr_t j = 0; j < kFpuRegisterSpillFactor; ++j) {
               bitmap->Set(bitmap->Length(), false);
             }
           }
         }
       }
       // General purpose registers have the lowest register number at the
       // highest address (i.e., first in the stackmap).
       for (intptr_t i = 0; i < kNumberOfCpuRegisters; ++i) {
         Register reg = static_cast<Register>(i);
         if (locs->live_registers()->ContainsRegister(reg)) {
@@ skipping 647 matching lines @@
     if (i != largest_ix) {
       // Swap.
       CidTarget temp = (*sorted)[i];
       (*sorted)[i] = (*sorted)[largest_ix];
       (*sorted)[largest_ix] = temp;
     }
   }
 }
 
 }  // namespace dart