Index: src/crankshaft/x64/lithium-codegen-x64.cc |
diff --git a/src/crankshaft/x64/lithium-codegen-x64.cc b/src/crankshaft/x64/lithium-codegen-x64.cc |
index 493bfd49f43f7e8b6f50de39c3a30055d3ba6365..1e7aaa4927b9699c7a1bd23f14a61918d312dc2b 100644 |
--- a/src/crankshaft/x64/lithium-codegen-x64.cc |
+++ b/src/crankshaft/x64/lithium-codegen-x64.cc |
@@ -3267,8 +3267,20 @@ void LCodeGen::DoDeferredMathAbsTaggedHeapNumber(LMathAbs* instr) { |
DeoptimizeIf(not_equal, instr, Deoptimizer::kNotAHeapNumber); |
Label slow, allocated, done; |
- Register tmp = input_reg.is(rax) ? rcx : rax; |
- Register tmp2 = tmp.is(rcx) ? rdx : input_reg.is(rcx) ? rdx : rcx; |
+ uint32_t available_regs = 0xf; |
+ if (input_reg.code() < 4) available_regs ^= input_reg.bit(); |
+ if (instr->context()->IsRegister()) { |
+ // Make sure that the context isn't overwritten in the AllocateHeapNumber |
+ // macro below. |
+ Register context_reg = ToRegister(instr->context()); |
+ if (context_reg.code() < 4) available_regs ^= context_reg.bit(); |
+ } |
+ |
+ Register tmp = |
+ Register::from_code(base::bits::CountTrailingZeros32(available_regs)); |
+ available_regs ^= tmp.bit(); |
+ Register tmp2 = |
+ Register::from_code(base::bits::CountTrailingZeros32(available_regs)); |
// Preserve the value of all registers. |
PushSafepointRegistersScope scope(this); |