From: mvstanton@chromium.org <mvstanton@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Fri, 13 Sep 2013 08:44:37 +0000 (+0000)
Subject: Revert "Every place where AllocationMemento is initialized with an"
X-Git-Tag: upstream/4.7.83~12510
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c29295e88bd4d62239413fe45151a98ec3e0f215;p=platform%2Fupstream%2Fv8.git

Revert "Every place where AllocationMemento is initialized with an"

This reverts r16705 for breaking Windows build.

R=dslomov@chromium.org

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

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

diff --git a/src/heap.cc b/src/heap.cc
index 108cfb3..24e4039 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -4310,10 +4310,6 @@ MaybeObject* Heap::AllocateWithAllocationSite(Map* map, AllocationSpace space,
   AllocationMemento* alloc_memento = reinterpret_cast<AllocationMemento*>(
       reinterpret_cast<Address>(result) + map->instance_size());
   alloc_memento->set_map_no_write_barrier(allocation_memento_map());
-
-  // TODO(mvstanton): To diagnose bug 284577, some extra checks
-  CHECK(allocation_site->map() == allocation_site_map());
-
   alloc_memento->set_allocation_site(*allocation_site, SKIP_WRITE_BARRIER);
   return result;
 }
@@ -5057,10 +5053,6 @@ MaybeObject* Heap::CopyJSObjectWithAllocationSite(
       AllocationMemento* alloc_memento;
       if (maybe_alloc_memento->To(&alloc_memento)) {
         alloc_memento->set_map_no_write_barrier(allocation_memento_map());
-
-        // TODO(mvstanton): To diagnose bug 284577, some extra checks
-        CHECK(site->map() == allocation_site_map());
-
         alloc_memento->set_allocation_site(site, SKIP_WRITE_BARRIER);
       }
     }
@@ -5083,10 +5075,6 @@ MaybeObject* Heap::CopyJSObjectWithAllocationSite(
     AllocationMemento* alloc_memento = reinterpret_cast<AllocationMemento*>(
         reinterpret_cast<Address>(clone) + object_size);
     alloc_memento->set_map_no_write_barrier(allocation_memento_map());
-
-    // TODO(mvstanton): To diagnose bug 284577, some extra checks
-    CHECK(site->map() == allocation_site_map());
-
     alloc_memento->set_allocation_site(site, SKIP_WRITE_BARRIER);
   }
 
diff --git a/src/hydrogen.cc b/src/hydrogen.cc
index 6c81518..23c373f 100644
--- a/src/hydrogen.cc
+++ b/src/hydrogen.cc
@@ -1831,20 +1831,6 @@ HValue* HGraphBuilder::BuildCreateAllocationMemento(HValue* previous_object,
   Handle<Map> alloc_memento_map(
       isolate()->heap()->allocation_memento_map());
   AddStoreMapConstant(alloc_memento, alloc_memento_map);
-
-  // TODO(mvstanton): the code below is turned on to diagnose chromium bug
-  // 284577.
-  Handle<Map> alloc_site_map(isolate()->heap()->allocation_site_map());
-  IfBuilder builder(this);
-  // Read the map
-  HValue* map_field = Add<HLoadNamedField>(alloc_site,
-                                           HObjectAccess::ForMap());
-  HValue* alloc_site_map_value = Add<HConstant>(alloc_site_map);
-  builder.IfNot<HCompareObjectEqAndBranch>(map_field, alloc_site_map_value);
-  builder.Then();
-  AddInstruction(new(zone()) HDebugBreak());
-  builder.End();
-
   HObjectAccess access = HObjectAccess::ForAllocationMementoSite();
   Add<HStoreNamedField>(alloc_memento, access, alloc_site);
   return alloc_memento;