Use the right ToInt32 overload (merge bustage, r=awfy red).
authorDavid Anderson <danderson@mozilla.com>
Mon, 30 Apr 2012 15:41:53 -0700
changeset 112432 1b379d8c4a5253d35ae79ccad45190013e81cfef
parent 112431 c7b2066b5bbf7db806c8fcbd140495e516b7fb48
child 112433 086958bf99e7d81fe86d19c968424a1be96edcf5
push id1708
push userakeybl@mozilla.com
push dateMon, 19 Nov 2012 21:10:21 +0000
treeherdermozilla-beta@27b14fe50103 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersawfy
milestone15.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Use the right ToInt32 overload (merge bustage, r=awfy red).
js/src/ion/shared/CodeGenerator-shared.cpp
js/src/ion/shared/CodeGenerator-x86-shared.cpp
--- a/js/src/ion/shared/CodeGenerator-shared.cpp
+++ b/js/src/ion/shared/CodeGenerator-shared.cpp
@@ -445,17 +445,17 @@ CodeGeneratorShared::visitOutOfLineTrunc
 {
     FloatRegister src = ool->src();
     Register dest = ool->dest();
 
     saveVolatile(dest);
 
     masm.setupUnalignedABICall(1, dest);
     masm.passABIArg(src);
-    masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, ToInt32));
+    masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, js::ToInt32));
     masm.storeCallResult(dest);
 
     restoreVolatile(dest);
 
     masm.jump(ool->rejoin());
     return true;
 }
 
--- a/js/src/ion/shared/CodeGenerator-x86-shared.cpp
+++ b/js/src/ion/shared/CodeGenerator-x86-shared.cpp
@@ -1113,17 +1113,17 @@ CodeGeneratorX86Shared::visitOutOfLineTr
     masm.j(Assembler::Equal, ool->rejoin());
 
     masm.bind(&fail);
     {
         saveVolatile(output);
 
         masm.setupUnalignedABICall(1, output);
         masm.passABIArg(input);
-        masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, ToInt32));
+        masm.callWithABI(JS_FUNC_TO_DATA_PTR(void *, js::ToInt32));
         masm.storeCallResult(output);
 
         restoreVolatile(output);
     }
 
     masm.jump(ool->rejoin());
     return true;
 }