Index: src/x64/code-stubs-x64.cc |
diff --git a/src/x64/code-stubs-x64.cc b/src/x64/code-stubs-x64.cc |
index dfbbd5ca9bb682b240318992966579ef2b7dc856..aea2833dc0dfb45762c9c8aeaeb5549bd1fed0e4 100644 |
--- a/src/x64/code-stubs-x64.cc |
+++ b/src/x64/code-stubs-x64.cc |
@@ -959,7 +959,7 @@ void MathPowStub::Generate(MacroAssembler* masm) { |
Label continue_sqrt, continue_rsqrt, not_plus_half; |
// Test for 0.5. |
// Load double_scratch with 0.5. |
- __ movq(scratch, V8_UINT64_C(0x3FE0000000000000), RelocInfo::NONE64); |
+ __ movq(scratch, V8_UINT64_C(0x3FE0000000000000)); |
__ movq(double_scratch, scratch); |
// Already ruled out NaNs for exponent. |
__ ucomisd(double_scratch, double_exponent); |
@@ -969,7 +969,7 @@ void MathPowStub::Generate(MacroAssembler* masm) { |
// Math.pow(-Infinity, 0.5) == Infinity (ECMA spec, 15.8.2.13). |
// According to IEEE-754, double-precision -Infinity has the highest |
// 12 bits set and the lowest 52 bits cleared. |
- __ movq(scratch, V8_UINT64_C(0xFFF0000000000000), RelocInfo::NONE64); |
+ __ movq(scratch, V8_UINT64_C(0xFFF0000000000000)); |
__ movq(double_scratch, scratch); |
__ ucomisd(double_scratch, double_base); |
// Comparing -Infinity with NaN results in "unordered", which sets the |
@@ -1001,7 +1001,7 @@ void MathPowStub::Generate(MacroAssembler* masm) { |
// case of Math.pow(-Infinity, -0.5) == 0 (ECMA spec, 15.8.2.13). |
// According to IEEE-754, double-precision -Infinity has the highest |
// 12 bits set and the lowest 52 bits cleared. |
- __ movq(scratch, V8_UINT64_C(0xFFF0000000000000), RelocInfo::NONE64); |
+ __ movq(scratch, V8_UINT64_C(0xFFF0000000000000)); |
__ movq(double_scratch, scratch); |
__ ucomisd(double_scratch, double_base); |
// Comparing -Infinity with NaN results in "unordered", which sets the |
@@ -3030,9 +3030,7 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
// Scratch register is neither callee-save, nor an argument register on any |
// platform. It's free to use at this point. |
// Cannot use smi-register for loading yet. |
- __ movq(kScratchRegister, |
- reinterpret_cast<uint64_t>(Smi::FromInt(marker)), |
- RelocInfo::NONE64); |
+ __ movq(kScratchRegister, Smi::FromInt(marker), RelocInfo::NONE64); |
__ push(kScratchRegister); // context slot |
__ push(kScratchRegister); // function slot |
// Save callee-saved registers (X64/Win64 calling conventions). |