Revision: 8646 Author: [email protected] Date: Wed Jul 13 09:36:26 2011 Log: Fixes build failures from FixedDoubleArray IC patch.
BUG=none TEST=windows build bot works Review URL: http://codereview.chromium.org/7342048 http://code.google.com/p/v8/source/detail?r=8646 Modified: /branches/bleeding_edge/src/assembler.cc /branches/bleeding_edge/src/objects-debug.cc /branches/bleeding_edge/src/objects-inl.h /branches/bleeding_edge/src/v8globals.h ======================================= --- /branches/bleeding_edge/src/assembler.cc Wed Jul 13 06:50:27 2011 +++ /branches/bleeding_edge/src/assembler.cc Wed Jul 13 09:36:26 2011 @@ -71,8 +71,7 @@ const double DoubleConstant::minus_zero = -0.0; const double DoubleConstant::uint8_max_value = 255; const double DoubleConstant::zero = 0.0; -const double DoubleConstant::canonical_non_hole_nan = - BitCast<double>(kCanonicalNonHoleNanInt64); +const double DoubleConstant::canonical_non_hole_nan = OS::nan_value(); const double DoubleConstant::the_hole_nan = BitCast<double>(kHoleNanInt64); const double DoubleConstant::negative_infinity = -V8_INFINITY; const char* RelocInfo::kFillerCommentString = "DEOPTIMIZATION PADDING"; ======================================= --- /branches/bleeding_edge/src/objects-debug.cc Mon Jul 4 23:19:53 2011 +++ /branches/bleeding_edge/src/objects-debug.cc Wed Jul 13 09:36:26 2011 @@ -315,7 +315,8 @@ if (!is_the_hole(i)) { double value = get(i); ASSERT(!isnan(value) || - BitCast<uint64_t>(value) == kCanonicalNonHoleNanInt64); + (BitCast<uint64_t>(value) == + BitCast<uint64_t>(canonical_not_the_hole_nan_as_double()))); } } } ======================================= --- /branches/bleeding_edge/src/objects-inl.h Wed Jul 13 06:50:27 2011 +++ /branches/bleeding_edge/src/objects-inl.h Wed Jul 13 09:36:26 2011 @@ -1621,7 +1621,9 @@ inline double FixedDoubleArray::canonical_not_the_hole_nan_as_double() { - return BitCast<double, uint64_t>(kCanonicalNonHoleNanInt64); + ASSERT(BitCast<uint64_t>(OS::nan_value()) != kHoleNanInt64); + ASSERT((BitCast<uint64_t>(OS::nan_value()) >> 32) != kHoleNanUpper32); + return OS::nan_value(); } ======================================= --- /branches/bleeding_edge/src/v8globals.h Wed Jul 13 06:50:27 2011 +++ /branches/bleeding_edge/src/v8globals.h Wed Jul 13 09:36:26 2011 @@ -509,15 +509,10 @@ static const uint32_t kHoleNanUpper32 = 0x7FFFFFFF; static const uint32_t kHoleNanLower32 = 0xFFFFFFFF; -static const uint32_t kCanonicalNonHoleNanUpper32 = 0x7FF10000; -static const uint32_t kCanonicalNonHoleNanLower32 = 0xFFFFFFFF; static const uint32_t kNaNOrInfinityLowerBoundUpper32 = 0x7FF00000; const uint64_t kHoleNanInt64 = (static_cast<uint64_t>(kHoleNanUpper32) << 32) | kHoleNanLower32; -const uint64_t kCanonicalNonHoleNanInt64 = - (static_cast<uint64_t>(kCanonicalNonHoleNanUpper32) << 32) | - kCanonicalNonHoleNanLower32; const uint64_t kLastNonNaNInt64 = (static_cast<uint64_t>(kNaNOrInfinityLowerBoundUpper32) << 32); -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
