Revision: 7001
Author: [email protected]
Date: Tue Mar 1 07:56:10 2011
Log: Merge r7000 from the bleeding_edge to 2.5 branch.
Review URL: http://codereview.chromium.org/6591071
http://code.google.com/p/v8/source/detail?r=7001
Modified:
/branches/2.5/src/ia32/codegen-ia32.cc
/branches/2.5/src/version.cc
=======================================
--- /branches/2.5/src/ia32/codegen-ia32.cc Wed Dec 15 03:37:39 2010
+++ /branches/2.5/src/ia32/codegen-ia32.cc Tue Mar 1 07:56:10 2011
@@ -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();
=======================================
--- /branches/2.5/src/version.cc Tue Mar 1 03:46:56 2011
+++ /branches/2.5/src/version.cc Tue Mar 1 07:56:10 2011
@@ -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
