Reviewers: fschneider, Description: Merge r7000 from the bleeding_edge to 2.5 branch.
Please review this at http://codereview.chromium.org/6591071/ SVN Base: http://v8.googlecode.com/svn/branches/2.5/ Affected files: M src/ia32/codegen-ia32.cc M src/version.cc Index: src/ia32/codegen-ia32.cc =================================================================== --- src/ia32/codegen-ia32.cc (revision 7000) +++ src/ia32/codegen-ia32.cc (working copy) @@ -8266,6 +8266,7 @@ switch (op) { case Token::SUB: { __ neg(value.reg()); + frame_->Push(&value); if (node->no_negative_zero()) { // -MIN_INT is MIN_INT with the overflow flag set. unsafe_bailout_->Branch(overflow); @@ -8278,17 +8279,18 @@ } case Token::BIT_NOT: { __ not_(value.reg()); + frame_->Push(&value); break; } case Token::ADD: { // Unary plus has no effect on int32 values. + frame_->Push(&value); break; } default: UNREACHABLE(); break; } - frame_->Push(&value); } else { Load(node->expression()); bool can_overwrite = node->expression()->ResultOverwriteAllowed(); Index: src/version.cc =================================================================== --- src/version.cc (revision 7000) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 2 #define MINOR_VERSION 5 #define BUILD_NUMBER 9 -#define PATCH_LEVEL 18 +#define PATCH_LEVEL 19 #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
