Revision: 9580
Author: [email protected]
Date: Tue Oct 11 04:38:00 2011
Log: Adjust assertions in the incremental marking.
Now we are completely transfering marks when shifting arrays in-place.
This might lead to white free space objects in the marking deque.
[email protected]
Review URL: http://codereview.chromium.org/8230009
http://code.google.com/p/v8/source/detail?r=9580
Modified:
/branches/bleeding_edge/src/incremental-marking.cc
=======================================
--- /branches/bleeding_edge/src/incremental-marking.cc Mon Oct 10 03:14:39
2011
+++ /branches/bleeding_edge/src/incremental-marking.cc Tue Oct 11 04:38:00
2011
@@ -517,7 +517,11 @@
array[new_top] = dest;
new_top = ((new_top + 1) & mask);
ASSERT(new_top != marking_deque_.bottom());
- ASSERT(Marking::IsGrey(Marking::MarkBitFrom(obj)));
+#ifdef DEBUG
+ MarkBit mark_bit = Marking::MarkBitFrom(obj);
+ ASSERT(Marking::IsGrey(mark_bit) ||
+ (obj->IsFiller() && Marking::IsWhite(mark_bit)));
+#endif
}
} else if (obj->map() != filler_map) {
// Skip one word filler objects that appear on the
@@ -525,7 +529,11 @@
array[new_top] = obj;
new_top = ((new_top + 1) & mask);
ASSERT(new_top != marking_deque_.bottom());
- ASSERT(Marking::IsGrey(Marking::MarkBitFrom(obj)));
+#ifdef DEBUG
+ MarkBit mark_bit = Marking::MarkBitFrom(obj);
+ ASSERT(Marking::IsGrey(mark_bit) ||
+ (obj->IsFiller() && Marking::IsWhite(mark_bit)));
+#endif
}
}
marking_deque_.set_top(new_top);
@@ -710,7 +718,6 @@
Map* map = obj->map();
if (map == filler_map) continue;
- ASSERT(Marking::IsGrey(Marking::MarkBitFrom(obj)));
int size = obj->SizeFromMap(map);
bytes_to_process -= size;
MarkBit map_mark_bit = Marking::MarkBitFrom(map);
@@ -733,7 +740,8 @@
}
MarkBit obj_mark_bit = Marking::MarkBitFrom(obj);
- ASSERT(!Marking::IsBlack(obj_mark_bit));
+ ASSERT(Marking::IsGrey(obj_mark_bit) ||
+ (obj->IsFiller() && Marking::IsWhite(obj_mark_bit)));
Marking::MarkBlack(obj_mark_bit);
MemoryChunk::IncrementLiveBytes(obj->address(), size);
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
