Revision: 16742
Author: [email protected]
Date: Mon Sep 16 16:50:41 2013 UTC
Log: Chromium 284577 needs a mitigation CL added. There is a TODO to
remove
the mitigation when the cause of the bug is discovered.
BUG=
[email protected], [email protected]
Review URL: https://codereview.chromium.org/23606032
http://code.google.com/p/v8/source/detail?r=16742
Modified:
/branches/bleeding_edge/src/heap.cc
/branches/bleeding_edge/src/hydrogen.cc
/branches/bleeding_edge/src/objects-debug.cc
/branches/bleeding_edge/src/objects.cc
=======================================
--- /branches/bleeding_edge/src/heap.cc Fri Sep 13 13:50:16 2013 UTC
+++ /branches/bleeding_edge/src/heap.cc Mon Sep 16 16:50:41 2013 UTC
@@ -4310,10 +4310,7 @@
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());
-
+ ASSERT(allocation_site->map() == allocation_site_map());
alloc_memento->set_allocation_site(*allocation_site, SKIP_WRITE_BARRIER);
return result;
}
@@ -5057,10 +5054,7 @@
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());
-
+ ASSERT(site->map() == allocation_site_map());
alloc_memento->set_allocation_site(site, SKIP_WRITE_BARRIER);
}
}
@@ -5083,10 +5077,7 @@
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());
-
+ ASSERT(site->map() == allocation_site_map());
alloc_memento->set_allocation_site(site, SKIP_WRITE_BARRIER);
}
=======================================
--- /branches/bleeding_edge/src/hydrogen.cc Mon Sep 16 13:51:14 2013 UTC
+++ /branches/bleeding_edge/src/hydrogen.cc Mon Sep 16 16:50:41 2013 UTC
@@ -1823,26 +1823,12 @@
HValue* HGraphBuilder::BuildCreateAllocationMemento(HValue*
previous_object,
int
previous_object_size,
HValue* alloc_site) {
- // TODO(mvstanton): ASSERT altered to CHECK to diagnose chromium bug
284577
- CHECK(alloc_site != NULL);
+ ASSERT(alloc_site != NULL);
HInnerAllocatedObject* alloc_memento = Add<HInnerAllocatedObject>(
previous_object, previous_object_size);
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);
- builder.If<HCompareMap>(alloc_site, alloc_site_map);
- builder.Then();
- builder.Else();
- Add<HDebugBreak>();
- builder.End();
- }
-
HObjectAccess access = HObjectAccess::ForAllocationMementoSite();
Add<HStoreNamedField>(alloc_memento, access, alloc_site);
return alloc_memento;
=======================================
--- /branches/bleeding_edge/src/objects-debug.cc Fri Sep 13 11:47:54 2013
UTC
+++ /branches/bleeding_edge/src/objects-debug.cc Mon Sep 16 16:50:41 2013
UTC
@@ -692,11 +692,6 @@
CHECK(elements()->IsUndefined() ||
elements()->IsFixedArray() ||
elements()->IsFixedDoubleArray());
- // TODO(mvstanton): to diagnose chromium bug 284577, remove after.
- AllocationMemento* memento = AllocationMemento::FindForJSObject(this);
- if (memento != NULL && memento->IsValid()) {
- memento->AllocationMementoVerify();
- }
}
}
=======================================
--- /branches/bleeding_edge/src/objects.cc Mon Sep 16 09:30:43 2013 UTC
+++ /branches/bleeding_edge/src/objects.cc Mon Sep 16 16:50:41 2013 UTC
@@ -9016,8 +9016,7 @@
// involves carefully checking the object immediately after the JSArray
// (if there is one) to see if it's an AllocationMemento.
if (FLAG_track_allocation_sites &&
object->GetHeap()->InNewSpace(object)) {
- // TODO(mvstanton): CHECK to diagnose chromium bug 284577, remove
after.
- CHECK(object->GetHeap()->InToSpace(object));
+ ASSERT(object->GetHeap()->InToSpace(object));
Address ptr_end = (reinterpret_cast<Address>(object) - kHeapObjectTag)
+
object->Size();
if ((ptr_end + AllocationMemento::kSize) <=
@@ -9027,15 +9026,20 @@
reinterpret_cast<Map**>(ptr_end);
if (*possible_allocation_memento_map ==
object->GetHeap()->allocation_memento_map()) {
- Address ptr_object = reinterpret_cast<Address>(object);
- // TODO(mvstanton): CHECK to diagnose chromium bug 284577, remove
after.
- // If this check fails it points to the very unlikely case that
we've
- // misinterpreted a page header as an allocation memento. Follow up
- // with a real fix.
- CHECK(Page::FromAddress(ptr_object) == Page::FromAddress(ptr_end));
AllocationMemento* memento = AllocationMemento::cast(
reinterpret_cast<Object*>(ptr_end + kHeapObjectTag));
- return memento;
+
+ // TODO(mvstanton): because of chromium bug 284577, put extra care
+ // into validating that the memento points to a valid
AllocationSite.
+ // This check is expensive so remove it asap. Also, this check
+ // HIDES bug 284577, so it must be disabled to debug/diagnose.
+ Object* site = memento->allocation_site();
+ Heap* heap = object->GetHeap();
+ if (heap->InOldPointerSpace(site) &&
+ site->IsHeapObject() &&
+ HeapObject::cast(site)->map() == heap->allocation_site_map()) {
+ return memento;
+ }
}
}
}
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
