Revision: 5632 Author: [email protected] Date: Sun Oct 17 23:24:36 2010 Log: Merge x64 minus-zero fix (bleeding_edge r5631) to 2.4 branch.
[email protected] Review URL: http://codereview.chromium.org/3844002 http://code.google.com/p/v8/source/detail?r=5632 Modified: /branches/2.4/src/version.cc /branches/2.4/src/x64/code-stubs-x64.cc /branches/2.4/test/mjsunit/smi-negative-zero.js ======================================= --- /branches/2.4/src/version.cc Thu Oct 14 03:08:08 2010 +++ /branches/2.4/src/version.cc Sun Oct 17 23:24:36 2010 @@ -35,7 +35,7 @@ #define MAJOR_VERSION 2 #define MINOR_VERSION 4 #define BUILD_NUMBER 9 -#define PATCH_LEVEL 1 +#define PATCH_LEVEL 2 #define CANDIDATE_VERSION false // Define SONAME to have the SCons build the put a specific SONAME into the ======================================= --- /branches/2.4/src/x64/code-stubs-x64.cc Mon Oct 4 01:54:21 2010 +++ /branches/2.4/src/x64/code-stubs-x64.cc Sun Oct 17 23:24:36 2010 @@ -1413,20 +1413,8 @@ __ j(equal, &done); } __ SmiNeg(rax, rax, &done); - - // Either zero or Smi::kMinValue, neither of which become a smi when - // negated. We handle negative zero here if required. We always enter - // the runtime system if we have Smi::kMinValue. - if (negative_zero_ == kStrictNegativeZero) { - __ SmiCompare(rax, Smi::FromInt(0)); - __ j(not_equal, &slow); - __ Move(rax, Factory::minus_zero_value()); - __ jmp(&done); - } else { - __ SmiCompare(rax, Smi::FromInt(Smi::kMinValue)); - __ j(equal, &slow); - __ jmp(&done); - } + __ jmp(&slow); // zero, if not handled above, and Smi::kMinValue. + // Try floating point case. __ bind(&try_float); } else if (FLAG_debug_code) { ======================================= --- /branches/2.4/test/mjsunit/smi-negative-zero.js Fri Oct 16 04:48:38 2009 +++ /branches/2.4/test/mjsunit/smi-negative-zero.js Sun Oct 17 23:24:36 2010 @@ -98,3 +98,16 @@ assertEquals(-Infinity, one / (-4 % -2), "fiskhest2"); assertEquals(Infinity, one / (4 % 2), "fiskhest3"); assertEquals(Infinity, one / (4 % -2), "fiskhest4"); + + +// This tests against a singleton -0.0 object being overwritten.gc +x = 0; +z = 3044; + +function foo(x) { + var y = -x + z; + return -x; +} + +assertEquals(0, foo(x)); +assertEquals(0, foo(x)); -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
