Index: src/crankshaft/x87/lithium-codegen-x87.cc |
diff --git a/src/crankshaft/x87/lithium-codegen-x87.cc b/src/crankshaft/x87/lithium-codegen-x87.cc |
index fe39fbf8e57c88eb1415f8ec142578e1bd1681b5..fdedb53a98a4fdd223727b990c63c9d26353ff52 100644 |
--- a/src/crankshaft/x87/lithium-codegen-x87.cc |
+++ b/src/crankshaft/x87/lithium-codegen-x87.cc |
@@ -3348,8 +3348,20 @@ void LCodeGen::DoDeferredMathAbsTaggedHeapNumber(LMathAbs* instr) { |
DeoptimizeIf(not_equal, instr, Deoptimizer::kNotAHeapNumber); |
Label slow, allocated, done; |
- Register tmp = input_reg.is(eax) ? ecx : eax; |
- Register tmp2 = tmp.is(ecx) ? edx : input_reg.is(ecx) ? edx : ecx; |
+ 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)); |
Jarin
2016/06/03 19:08:17
I am not quite happy about hardcoding the integer
|
// Preserve the value of all registers. |
PushSafepointRegistersScope scope(this); |