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
parent 25c4f763
...@@ -4310,10 +4310,6 @@ MaybeObject* Heap::AllocateWithAllocationSite(Map* map, AllocationSpace space, ...@@ -4310,10 +4310,6 @@ MaybeObject* Heap::AllocateWithAllocationSite(Map* map, AllocationSpace space,
AllocationMemento* alloc_memento = reinterpret_cast<AllocationMemento*>( AllocationMemento* alloc_memento = reinterpret_cast<AllocationMemento*>(
reinterpret_cast<Address>(result) + map->instance_size()); reinterpret_cast<Address>(result) + map->instance_size());
alloc_memento->set_map_no_write_barrier(allocation_memento_map()); 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); alloc_memento->set_allocation_site(*allocation_site, SKIP_WRITE_BARRIER);
return result; return result;
} }
...@@ -5057,10 +5053,6 @@ MaybeObject* Heap::CopyJSObjectWithAllocationSite( ...@@ -5057,10 +5053,6 @@ MaybeObject* Heap::CopyJSObjectWithAllocationSite(
AllocationMemento* alloc_memento; AllocationMemento* alloc_memento;
if (maybe_alloc_memento->To(&alloc_memento)) { if (maybe_alloc_memento->To(&alloc_memento)) {
alloc_memento->set_map_no_write_barrier(allocation_memento_map()); 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); alloc_memento->set_allocation_site(site, SKIP_WRITE_BARRIER);
} }
} }
...@@ -5083,10 +5075,6 @@ MaybeObject* Heap::CopyJSObjectWithAllocationSite( ...@@ -5083,10 +5075,6 @@ MaybeObject* Heap::CopyJSObjectWithAllocationSite(
AllocationMemento* alloc_memento = reinterpret_cast<AllocationMemento*>( AllocationMemento* alloc_memento = reinterpret_cast<AllocationMemento*>(
reinterpret_cast<Address>(clone) + object_size); reinterpret_cast<Address>(clone) + object_size);
alloc_memento->set_map_no_write_barrier(allocation_memento_map()); 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); alloc_memento->set_allocation_site(site, SKIP_WRITE_BARRIER);
} }
......
...@@ -1831,20 +1831,6 @@ HValue* HGraphBuilder::BuildCreateAllocationMemento(HValue* previous_object, ...@@ -1831,20 +1831,6 @@ HValue* HGraphBuilder::BuildCreateAllocationMemento(HValue* previous_object,
Handle<Map> alloc_memento_map( Handle<Map> alloc_memento_map(
isolate()->heap()->allocation_memento_map()); isolate()->heap()->allocation_memento_map());
AddStoreMapConstant(alloc_memento, alloc_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(); HObjectAccess access = HObjectAccess::ForAllocationMementoSite();
Add<HStoreNamedField>(alloc_memento, access, alloc_site); Add<HStoreNamedField>(alloc_memento, access, alloc_site);
return alloc_memento; return alloc_memento;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment