| Index: src/arm/macro-assembler-arm.cc
 | 
| diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc
 | 
| index 1e2df8046272b66da3a22b1d4743977e6fc8b741..da467ccc835eacbbcffbbd6a47e40fe63c5a65db 100644
 | 
| --- a/src/arm/macro-assembler-arm.cc
 | 
| +++ b/src/arm/macro-assembler-arm.cc
 | 
| @@ -12,7 +12,6 @@
 | 
|  #include "src/codegen.h"
 | 
|  #include "src/cpu-profiler.h"
 | 
|  #include "src/debug/debug.h"
 | 
| -#include "src/register-configuration.h"
 | 
|  #include "src/runtime/runtime.h"
 | 
|  
 | 
|  #include "src/arm/macro-assembler-arm.h"
 | 
| @@ -761,8 +760,7 @@
 | 
|    // Number of d-regs not known at snapshot time.
 | 
|    DCHECK(!serializer_enabled());
 | 
|    // General purpose registers are pushed last on the stack.
 | 
| -  const RegisterConfiguration* config = RegisterConfiguration::ArchDefault();
 | 
| -  int doubles_size = config->num_allocatable_double_registers() * kDoubleSize;
 | 
| +  int doubles_size = DwVfpRegister::NumAllocatableRegisters() * kDoubleSize;
 | 
|    int register_offset = SafepointRegisterStackIndex(reg.code()) * kPointerSize;
 | 
|    return MemOperand(sp, doubles_size + register_offset);
 | 
|  }
 | 
| @@ -3573,10 +3571,8 @@
 | 
|    if (reg5.is_valid()) regs |= reg5.bit();
 | 
|    if (reg6.is_valid()) regs |= reg6.bit();
 | 
|  
 | 
| -  const RegisterConfiguration* config = RegisterConfiguration::ArchDefault();
 | 
| -  for (int i = 0; i < config->num_allocatable_general_registers(); ++i) {
 | 
| -    int code = config->GetAllocatableGeneralCode(i);
 | 
| -    Register candidate = Register::from_code(code);
 | 
| +  for (int i = 0; i < Register::NumAllocatableRegisters(); i++) {
 | 
| +    Register candidate = Register::FromAllocationIndex(i);
 | 
|      if (regs & candidate.bit()) continue;
 | 
|      return candidate;
 | 
|    }
 | 
| 
 |