From: danno@chromium.org <danno@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Wed, 13 Jul 2011 16:51:30 +0000 (+0000)
Subject: Fix the build on x64 and ARM.
X-Git-Tag: upstream/4.7.83~18902
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a2d162becdd1789ed60e04557c1ea78eb3731abc;p=platform%2Fupstream%2Fv8.git

Fix the build on x64 and ARM.

BUG=none
TEST=bot greeness

Review URL: http://codereview.chromium.org/7357002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@8647 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---

diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc
index 2ca9c6b..c2665f8 100644
--- a/src/arm/stub-cache-arm.cc
+++ b/src/arm/stub-cache-arm.cc
@@ -4380,8 +4380,10 @@ void KeyedStoreStubCompiler::GenerateStoreFastDoubleElement(
   __ b(eq, &have_double_value);
   __ bind(&is_nan);
   // Load canonical NaN for storing into the double array.
-  __ mov(mantissa_reg, Operand(kCanonicalNonHoleNanLower32));
-  __ mov(exponent_reg, Operand(kCanonicalNonHoleNanUpper32));
+  uint64_t nan_int64 = BitCast<uint64_t>(
+      FixedDoubleArray::canonical_not_the_hole_nan_as_double());
+  __ mov(mantissa_reg, Operand(static_cast<uint32_t>(nan_int64)));
+  __ mov(exponent_reg, Operand(static_cast<uint32_t>(nan_int64 >> 32)));
   __ jmp(&have_double_value);
 
   __ bind(&smi_value);
diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc
index aea2ed8..d4f9d7c 100644
--- a/src/x64/stub-cache-x64.cc
+++ b/src/x64/stub-cache-x64.cc
@@ -3748,7 +3748,8 @@ void KeyedStoreStubCompiler::GenerateStoreFastDoubleElement(
   // the double array.
   ExternalReference canonical_nan_reference =
       ExternalReference::address_of_canonical_non_hole_nan();
-  __ Set(kScratchRegister, kCanonicalNonHoleNanInt64);
+  __ Set(kScratchRegister, BitCast<uint64_t>(
+      FixedDoubleArray::canonical_not_the_hole_nan_as_double()));
   __ movq(xmm0, kScratchRegister);
   __ jmp(&have_double_value, Label::kNear);