Index: src/arm/macro-assembler-arm.cc |
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
index 0356dd854b86cc08eb7cd069dd94ada0d14f92ad..e3320354c2e6adced577cc47e74ffa42942a7fa1 100644 |
--- a/src/arm/macro-assembler-arm.cc |
+++ b/src/arm/macro-assembler-arm.cc |
@@ -760,7 +760,8 @@ MemOperand MacroAssembler::SafepointRegistersAndDoublesSlot(Register reg) { |
// 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(); |
+ const RegisterConfiguration* config = |
+ RegisterConfiguration::ArchDefault(RegisterConfiguration::CRANKSHAFT); |
int doubles_size = config->num_allocatable_double_registers() * kDoubleSize; |
int register_offset = SafepointRegisterStackIndex(reg.code()) * kPointerSize; |
return MemOperand(sp, doubles_size + register_offset); |
@@ -3580,7 +3581,8 @@ Register GetRegisterThatIsNotOneOf(Register reg1, |
if (reg5.is_valid()) regs |= reg5.bit(); |
if (reg6.is_valid()) regs |= reg6.bit(); |
- const RegisterConfiguration* config = RegisterConfiguration::ArchDefault(); |
+ const RegisterConfiguration* config = |
+ RegisterConfiguration::ArchDefault(RegisterConfiguration::CRANKSHAFT); |
for (int i = 0; i < config->num_allocatable_general_registers(); ++i) { |
int code = config->GetAllocatableGeneralCode(i); |
Register candidate = Register::from_code(code); |