Record a correct deoptimization environment for slow-path code.

runtime/vm/locations.h

 // 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.
 
 #ifndef VM_LOCATIONS_H_
 #define VM_LOCATIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/bitfield.h"
@@ skipping 350 matching lines @@
   }
 
   bool ContainsRegister(Register reg) const {
     return (cpu_registers_ & (1 << reg)) != 0;
   }
 
   bool ContainsFpuRegister(FpuRegister fpu_reg) const {
     return (fpu_registers_ & (1 << fpu_reg)) != 0;
   }
 
-  intptr_t fpu_regs_count() const {
-    intptr_t count = 0;
-    for (intptr_t reg_idx = 0; reg_idx < kNumberOfFpuRegisters; reg_idx++) {
-      if (ContainsFpuRegister(static_cast<FpuRegister>(reg_idx))) {
-        count++;
-      }
-    }
-    return count;
-  }
+  intptr_t CpuRegisterCount() const { return RegisterCount(cpu_registers_); }

[Florian Schneider, 2013/10/17 14:38:52]

I don't see that function used anywhere. Do you anticipate a use for it?

+  intptr_t FpuRegisterCount() const { return RegisterCount(fpu_registers_); }
+
+  static intptr_t RegisterCount(intptr_t registers);
 
   intptr_t cpu_registers() const { return cpu_registers_; }
   intptr_t fpu_registers() const { return fpu_registers_; }
 
  private:
   intptr_t cpu_registers_;
   intptr_t fpu_registers_;
 
   DISALLOW_COPY_AND_ASSIGN(RegisterSet);
 };
@@ skipping 92 matching lines @@
   BitmapBuilder* stack_bitmap_;
 
   const ContainsCall contains_call_;
   RegisterSet live_registers_;
 };
 
 
 }  // namespace dart
 
 #endif  // VM_LOCATIONS_H_