Reviewers: Mads Ager, Description: Merge bleeding_edge revision 3032 to trunk
BUG=475 TEST=mjsunit/regress/regress-475.js [email protected] Please review this at http://codereview.chromium.org/293024 SVN Base: http://v8.googlecode.com/svn/trunk/ Affected files: M src/ia32/codegen-ia32.cc M src/version.cc A + test/mjsunit/regress/regress-475.js Index: test/mjsunit/regress/regress-475.js Index: src/ia32/codegen-ia32.cc =================================================================== --- src/ia32/codegen-ia32.cc (revision 3092) +++ src/ia32/codegen-ia32.cc (working copy) @@ -6531,7 +6531,7 @@ Register left, Register right) { if (!ArgsInRegistersSupported()) { - // Only pass arguments in registers if there is no smi code in the stub. + // Pass arguments on the stack. __ push(left); __ push(right); } else { @@ -6584,7 +6584,7 @@ Register left, Smi* right) { if (!ArgsInRegistersSupported()) { - // Only pass arguments in registers if there is no smi code in the stub. + // Pass arguments on the stack. __ push(left); __ push(Immediate(right)); } else { @@ -6612,8 +6612,8 @@ MacroAssembler* masm, Smi* left, Register right) { - if (flags_ != NO_SMI_CODE_IN_STUB) { - // Only pass arguments in registers if there is no smi code in the stub. + if (!ArgsInRegistersSupported()) { + // Pass arguments on the stack. __ push(Immediate(left)); __ push(right); } else { Index: src/version.cc =================================================================== --- src/version.cc (revision 3092) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 1 #define MINOR_VERSION 3 #define BUILD_NUMBER 16 -#define PATCH_LEVEL 0 +#define PATCH_LEVEL 1 #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 -~----------~----~----~----~------~----~------~--~---
