Bug 809306 - Fix Win64 bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 14 Jun 2013 22:23:21 -0400
changeset 147503 3d16d59c93172e0dda1097742900a81e2a5ae8bc
parent 147502 05d9196b27a1dcf13049ba8be533a044cc642444
child 147504 7f8de495bf6dc746a20dcbcfa49d4b76fa9b6b48
push id368
push userbbajaj@mozilla.com
push dateMon, 09 Sep 2013 22:57:58 +0000
treeherdermozilla-release@5a4f47ae1217 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs809306
milestone24.0a1
first release with
nightly linux32
3d16d59c9317 / 24.0a1 / 20130615031212 / files
nightly linux64
3d16d59c9317 / 24.0a1 / 20130615031212 / files
nightly mac
3d16d59c9317 / 24.0a1 / 20130615031212 / files
nightly win32
3d16d59c9317 / 24.0a1 / 20130615031212 / files
nightly win64
3d16d59c9317 / 24.0a1 / 20130615031212 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 809306 - Fix Win64 bustage.
js/src/ion/x64/Assembler-x64.h
--- a/js/src/ion/x64/Assembler-x64.h
+++ b/js/src/ion/x64/Assembler-x64.h
@@ -82,20 +82,20 @@ static const MOZ_CONSTEXPR Register Call
 static const MOZ_CONSTEXPR Register CallTempReg3 = rcx;
 static const MOZ_CONSTEXPR Register CallTempReg4 = rsi;
 static const MOZ_CONSTEXPR Register CallTempReg5 = rdx;
 static const MOZ_CONSTEXPR Register CallTempReg6 = rbp;
 
 // Different argument registers for WIN64
 #if defined(_WIN64)
 static const MOZ_CONSTEXPR Register IntArgReg0 = rcx;
-static constMOZ_CONSTEXPRconstexpr Register IntArgReg1 = rdx;
+static const MOZ_CONSTEXPR Register IntArgReg1 = rdx;
 static const MOZ_CONSTEXPR Register IntArgReg2 = r8;
 static const MOZ_CONSTEXPR Register IntArgReg3 = r9;
-static constMOZ_CONSTEXPRuint32_t NumIntArgRegs = 4;
+static const MOZ_CONSTEXPR uint32_t NumIntArgRegs = 4;
 static const MOZ_CONSTEXPR Register IntArgRegs[NumIntArgRegs] = { rcx, rdx, r8, r9 };
 
 static const MOZ_CONSTEXPR Register CallTempNonArgRegs[] = { rax, rdi, rbx, rsi };
 static const uint32_t NumCallTempNonArgRegs =
     mozilla::ArrayLength(CallTempNonArgRegs);
 
 static const MOZ_CONSTEXPR FloatRegister FloatArgReg0 = xmm0;
 static const MOZ_CONSTEXPR FloatRegister FloatArgReg1 = xmm1;