Reviewers: Erik Corry, Description: Port r6332 to 2.5 branch
[email protected] Please review this at http://codereview.chromium.org/6361001/ SVN Base: http://v8.googlecode.com/svn/branches/2.5/ Affected files: M src/arm/stub-cache-arm.cc M src/version.cc Index: src/arm/stub-cache-arm.cc =================================================================== --- src/arm/stub-cache-arm.cc (revision 6332) +++ src/arm/stub-cache-arm.cc (working copy) @@ -1923,7 +1923,7 @@ __ cmp(r7, Operand(HeapNumber::kMantissaBits)); // If greater or equal, the argument is already round and in r0. __ b(&restore_fpscr_and_return, ge); - __ b(&slow); + __ b(&wont_fit_smi); __ bind(&no_vfp_exception); // Move the result back to general purpose register r0. @@ -1951,10 +1951,10 @@ __ Ret(); __ bind(&wont_fit_smi); - __ bind(&slow); // Restore FPCSR and fall to slow case. __ vmsr(r3); + __ bind(&slow); // Tail call the full function. We do not have to patch the receiver // because the function makes no use of it. __ InvokeFunction(function, arguments(), JUMP_FUNCTION); Index: src/version.cc =================================================================== --- src/version.cc (revision 6332) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 2 #define MINOR_VERSION 5 #define BUILD_NUMBER 9 -#define PATCH_LEVEL 8 +#define PATCH_LEVEL 9 #define CANDIDATE_VERSION false // Define SONAME to have the SCons build the put a specific SONAME into the -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
