Index: src/x64/macro-assembler-x64.cc |
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc |
index 2932ec893cb2379f0bde24d2fbc67bd7e5a33cf4..1db0615486c15fd85f8f82059e1503a096018989 100644 |
--- a/src/x64/macro-assembler-x64.cc |
+++ b/src/x64/macro-assembler-x64.cc |
@@ -3427,7 +3427,7 @@ void MacroAssembler::StoreNumberToDoubleElements( |
XMMRegister xmm_scratch, |
Label* fail, |
int elements_offset) { |
- Label smi_value, is_nan, maybe_nan, not_nan, have_double_value, done; |
+ Label smi_value, done; |
JumpIfSmi(maybe_number, &smi_value, Label::kNear); |
@@ -3436,44 +3436,20 @@ void MacroAssembler::StoreNumberToDoubleElements( |
fail, |
DONT_DO_SMI_CHECK); |
- // Double value, canonicalize NaN. |
- uint32_t offset = HeapNumber::kValueOffset + sizeof(kHoleNanLower32); |
- cmpl(FieldOperand(maybe_number, offset), |
- Immediate(kNaNOrInfinityLowerBoundUpper32)); |
- j(greater_equal, &maybe_nan, Label::kNear); |
- |
- bind(¬_nan); |
- movsd(xmm_scratch, FieldOperand(maybe_number, HeapNumber::kValueOffset)); |
- bind(&have_double_value); |
- movsd(FieldOperand(elements, index, times_8, |
- FixedDoubleArray::kHeaderSize - elements_offset), |
- xmm_scratch); |
- jmp(&done); |
- |
- bind(&maybe_nan); |
- // Could be NaN or Infinity. If fraction is not zero, it's NaN, otherwise |
- // it's an Infinity, and the non-NaN code path applies. |
- j(greater, &is_nan, Label::kNear); |
- cmpl(FieldOperand(maybe_number, HeapNumber::kValueOffset), Immediate(0)); |
- j(zero, ¬_nan); |
- bind(&is_nan); |
- // Convert all NaNs to the same canonical NaN value when they are stored in |
- // the double array. |
- Set(kScratchRegister, |
- bit_cast<uint64_t>( |
- FixedDoubleArray::canonical_not_the_hole_nan_as_double())); |
- movq(xmm_scratch, kScratchRegister); |
- jmp(&have_double_value, Label::kNear); |
+ // Double value, turn potential sNaN into qNaN. |
+ Move(xmm_scratch, 1.0); |
+ mulsd(xmm_scratch, FieldOperand(maybe_number, HeapNumber::kValueOffset)); |
+ jmp(&done, Label::kNear); |
bind(&smi_value); |
// Value is a smi. convert to a double and store. |
// Preserve original value. |
SmiToInteger32(kScratchRegister, maybe_number); |
Cvtlsi2sd(xmm_scratch, kScratchRegister); |
+ bind(&done); |
movsd(FieldOperand(elements, index, times_8, |
FixedDoubleArray::kHeaderSize - elements_offset), |
xmm_scratch); |
- bind(&done); |
} |