mozilla-inbound: changeset 140917:db6598c7675f817ceeb30da521a3cecf7a244a12

author	Marty Rosenberg <mrosenberg@mozilla.com>
	Thu, 01 Aug 2013 05:02:00 -0400
changeset 140917	db6598c7675f817ceeb30da521a3cecf7a244a12
parent 140916	800e0ac69709420b0d1ebd50e366cb16934faabc
child 140918	a18191f49ae6dadd7226ae87ede78829c593d44a
push id	31912
push user	mrosenberg@mozilla.com
push date	Thu, 01 Aug 2013 09:01:02 +0000
treeherder	mozilla-inbound@db6598c7675f [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jbramley
bugs	900357
milestone	25.0a1
first release with	nightly linux32 76a944fa6b25 / 25.0a1 / 20130802030204 / files nightly linux64 76a944fa6b25 / 25.0a1 / 20130802030204 / files nightly mac 76a944fa6b25 / 25.0a1 / 20130802030204 / files nightly win32 76a944fa6b25 / 25.0a1 / 20130802030204 / files nightly win64 76a944fa6b25 / 25.0a1 / 20130802030204 / files
last release without	nightly linux32 05d3797276d3 / 25.0a1 / 20130801030223 / files nightly linux64 05d3797276d3 / 25.0a1 / 20130801030223 / files nightly mac 05d3797276d3 / 25.0a1 / 20130801030223 / files nightly win32 05d3797276d3 / 25.0a1 / 20130801030223 / files nightly win64 05d3797276d3 / 25.0a1 / 20130801030223 / files

--- a/js/src/ion/arm/MacroAssembler-arm.cpp
+++ b/js/src/ion/arm/MacroAssembler-arm.cpp
@@ -2014,18 +2014,18 @@ void
 MacroAssemblerARMCompat::store32(const Register &src, const Address &address)
 {
     storePtr(src, address);
 }
 
 void
 MacroAssemblerARMCompat::store32(const Imm32 &src, const Address &address)
 {
-    move32(src, ScratchRegister);
-    storePtr(ScratchRegister, address);
+    move32(src, secondScratchReg_);
+    storePtr(secondScratchReg_, address);
 }
 
 void
 MacroAssemblerARMCompat::store32(const Imm32 &imm, const BaseIndex &dest)
 {
     ma_mov(imm, secondScratchReg_);
     store32(secondScratchReg_, dest);
 }