Index: src/code-stub-assembler.cc |
diff --git a/src/code-stub-assembler.cc b/src/code-stub-assembler.cc |
index 93e98713fb7509165afef9be23af0f07808f3c9d..09113048f422b439260004499125a9719c165151 100644 |
--- a/src/code-stub-assembler.cc |
+++ b/src/code-stub-assembler.cc |
@@ -1151,10 +1151,19 @@ Node* CodeStubAssembler::LoadDoubleWithHoleCheck(Node* base, Node* offset, |
Label* if_hole, |
MachineType machine_type) { |
if (if_hole) { |
- Node* element_upper = |
- Load(MachineType::Uint32(), base, |
- IntPtrAdd(offset, IntPtrConstant(kIeeeDoubleExponentWordOffset))); |
- GotoIf(Word32Equal(element_upper, Int32Constant(kHoleNanUpper32)), if_hole); |
+ // TODO(ishell): Compare only the upper part for the hole once the |
+ // compiler is able to fold addition of already complex |offset| with |
+ // |kIeeeDoubleExponentWordOffset| into one addressing mode. |
+ if (Is64()) { |
+ Node* element = Load(MachineType::Uint64(), base, offset); |
+ GotoIf(Word64Equal(element, Int64Constant(kHoleNanInt64)), if_hole); |
+ } else { |
+ Node* element_upper = Load( |
+ MachineType::Uint32(), base, |
+ IntPtrAdd(offset, IntPtrConstant(kIeeeDoubleExponentWordOffset))); |
+ GotoIf(Word32Equal(element_upper, Int32Constant(kHoleNanUpper32)), |
+ if_hole); |
+ } |
} |
if (machine_type.IsNone()) { |
// This means the actual value is not needed. |