Reviewers: fschneider,

Description:
Merge r5793 into 2.3 branch.


Please review this at http://codereview.chromium.org/4699003/show

SVN Base: http://v8.googlecode.com/svn/branches/2.3/

Affected files:
  M     src/ia32/codegen-ia32.cc
  M     src/version.cc
  A  +  test/mjsunit/regress/regress-927.js


### BEGIN SVN COPY METADATA
#$ cp branches/bleeding_edge/test/mjsunit/regress/regress-927.js test/mjsunit/regress/regress-927.js
### END SVN COPY METADATA
Index: src/ia32/codegen-ia32.cc
===================================================================
--- src/ia32/codegen-ia32.cc    (revision 5793)
+++ src/ia32/codegen-ia32.cc    (working copy)
@@ -8573,9 +8573,11 @@
       }
       right.Unuse();
       frame_->Push(&left);
-      if (!node->to_int32()) {
-        // If ToInt32 is called on the result of ADD, SUB, or MUL, we don't
+      if (!node->to_int32() || op == Token::MUL) {
+        // If ToInt32 is called on the result of ADD, SUB, we don't
         // care about overflows.
+        // Result of MUL can be non-representable precisely in double so
+        // we have to check for overflow.
         unsafe_bailout_->Branch(overflow);
       }
       break;
Index: src/version.cc
===================================================================
--- src/version.cc      (revision 5793)
+++ src/version.cc      (working copy)
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     2
 #define MINOR_VERSION     3
 #define BUILD_NUMBER      11
-#define PATCH_LEVEL       23
+#define PATCH_LEVEL       24
 #define CANDIDATE_VERSION false

 // Define SONAME to have the SCons build the put a specific SONAME into the
Index: test/mjsunit/regress/regress-927.js


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to