Reviewers: Toon Verwaest,
Description:
Fix missing slot recording in transition compaction.
[email protected]
TEST=cctest/test-api/Threading2
Please review this at https://chromiumcodereview.appspot.com/10658033/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/objects.cc
Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index
5ec05aa4ebc230ddaf5aa24847b7ae2b1b26c240..a7fdc24e44096c3d88a195fcfb18a8b803aba940
100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -7444,6 +7444,9 @@ static bool
ClearNonLiveTransitionsFromDescriptor(Heap* heap,
}
+// TODO(mstarzinger): This method should be moved into
MarkCompactCollector,
+// because it cannot be called from outside the GC and we already have
methods
+// depending on the transitions layout in the GC anyways.
void Map::ClearNonLiveTransitions(Heap* heap) {
Object* array = *RawField(this,
Map::kInstanceDescriptorsOrBitField3Offset);
// If there are no descriptors to be cleared, return.
@@ -7457,9 +7460,16 @@ void Map::ClearNonLiveTransitions(Heap* heap) {
for (int i = 0; i < d->number_of_descriptors(); ++i) {
if (!ClearNonLiveTransitionsFromDescriptor(heap, d, i)) {
if (i != descriptor_index) {
- d->SetKeyUnchecked(heap, descriptor_index, d->GetKey(i));
+ MarkCompactCollector* collector = heap->mark_compact_collector();
+ Object** key_slot = d->GetKeySlot(descriptor_index);
+ String* key = d->GetKey(i);
+ d->SetKeyUnchecked(heap, descriptor_index, key);
+ collector->RecordSlot(key_slot, key_slot, key);
d->SetDetailsUnchecked(descriptor_index, d->GetDetails(i).AsSmi());
- d->SetValueUnchecked(heap, descriptor_index, d->GetValue(i));
+ Object** value_slot = d->GetValueSlot(descriptor_index);
+ Object* value = d->GetValue(i);
+ d->SetValueUnchecked(heap, descriptor_index, value);
+ collector->RecordSlot(value_slot, value_slot, value);
}
descriptor_index++;
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
