From: hpayer@chromium.org <hpayer@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Tue, 27 Aug 2013 11:51:03 +0000 (+0000)
Subject: Filler sizes have to be Smis, fix x64 breakage.
X-Git-Tag: upstream/4.7.83~12809
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc6a16d6e084053611de1625e7f93ab5fd5e2649;p=platform%2Fupstream%2Fv8.git

Filler sizes have to be Smis, fix x64 breakage.

BUG=
R=jkummerow@chromium.org

Review URL: https://codereview.chromium.org/23577002

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

diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc
index 07e78f3..8c9b763 100644
--- a/src/hydrogen-instructions.cc
+++ b/src/hydrogen-instructions.cc
@@ -3296,7 +3296,11 @@ void HAllocate::HandleSideEffectDominator(GVNFlag side_effect,
   }
 
   HInstruction* new_dominator_size_constant = HConstant::CreateAndInsertBefore(
-      zone, context(), new_dominator_size, dominator_allocate);
+      zone,
+      context(),
+      new_dominator_size,
+      Representation::None(),
+      dominator_allocate);
   dominator_allocate->UpdateSize(new_dominator_size_constant);
 
 #ifdef VERIFY_HEAP
@@ -3389,11 +3393,15 @@ HAllocate* HAllocate::GetFoldableDominator(HAllocate* dominator) {
 void HAllocate::UpdateFreeSpaceFiller(int32_t free_space_size) {
   ASSERT(filler_free_space_size_ != NULL);
   Zone* zone = block()->zone();
+  // We must explicitly force Smi representation here because on x64 we
+  // would otherwise automatically choose int32, but the actual store
+  // requires a Smi-tagged value.
   HConstant* new_free_space_size = HConstant::CreateAndInsertBefore(
       zone,
       context(),
       filler_free_space_size_->value()->GetInteger32Constant() +
           free_space_size,
+      Representation::Smi(),
       filler_free_space_size_);
   filler_free_space_size_->UpdateValue(new_free_space_size);
 }
@@ -3419,10 +3427,15 @@ void HAllocate::CreateFreeSpaceFiller(int32_t free_space_size) {
   store_map->SetFlag(HValue::kHasNoObservableSideEffects);
   store_map->InsertAfter(filler_map);
 
+  // We must explicitly force Smi representation here because on x64 we
+  // would otherwise automatically choose int32, but the actual store
+  // requires a Smi-tagged value.
   HConstant* filler_size = HConstant::CreateAndInsertAfter(
-      zone, context(), free_space_size, store_map);
+      zone, context(), free_space_size, Representation::Smi(), store_map);
+  // Must force Smi representation for x64 (see comment above).
   HObjectAccess access =
-      HObjectAccess::ForJSObjectOffset(FreeSpace::kSizeOffset);
+      HObjectAccess::ForJSObjectOffset(FreeSpace::kSizeOffset,
+          Representation::Smi());
   HStoreNamedField* store_size = HStoreNamedField::New(zone, context(),
       free_space_instr, access, filler_size);
   store_size->SetFlag(HValue::kHasNoObservableSideEffects);
diff --git a/src/hydrogen-instructions.h b/src/hydrogen-instructions.h
index 8668793..af954de 100644
--- a/src/hydrogen-instructions.h
+++ b/src/hydrogen-instructions.h
@@ -3246,8 +3246,10 @@ class HConstant V8_FINAL : public HTemplateInstruction<0> {
   static HConstant* CreateAndInsertAfter(Zone* zone,
                                          HValue* context,
                                          int32_t value,
+                                         Representation representation,
                                          HInstruction* instruction) {
-    HConstant* new_constant = HConstant::New(zone, context, value);
+    HConstant* new_constant =
+        HConstant::New(zone, context, value, representation);
     new_constant->InsertAfter(instruction);
     return new_constant;
   }
@@ -3255,8 +3257,10 @@ class HConstant V8_FINAL : public HTemplateInstruction<0> {
   static HConstant* CreateAndInsertBefore(Zone* zone,
                                           HValue* context,
                                           int32_t value,
+                                          Representation representation,
                                           HInstruction* instruction) {
-    HConstant* new_constant = HConstant::New(zone, context, value);
+    HConstant* new_constant =
+        HConstant::New(zone, context, value, representation);
     new_constant->InsertBefore(instruction);
     return new_constant;
   }