Revision: 10927
Author: [email protected]
Date: Mon Mar 5 08:39:25 2012
Log: Ensure that inner pseudo-chunks are correctly initialized in
FreeQueuedChunks.
Fields introduced with guarding code space pages (area_start_, area_end_)
were not correctly handled which lead to errors in StoreBuffer filtering.
[email protected]
TEST=mozilla/data/js1_5/GC/regress-203278-2.js
Review URL: https://chromiumcodereview.appspot.com/9600020
http://code.google.com/p/v8/source/detail?r=10927
Modified:
/branches/bleeding_edge/src/heap.cc
/branches/bleeding_edge/src/spaces.h
=======================================
--- /branches/bleeding_edge/src/heap.cc Mon Mar 5 04:26:19 2012
+++ /branches/bleeding_edge/src/heap.cc Mon Mar 5 08:39:25 2012
@@ -6918,14 +6918,18 @@
// pieces and initialize size, owner and flags field of every piece.
// If FromAnyPointerAddress encounters a slot that belongs to one of
// these smaller pieces it will treat it as a slot on a normal Page.
+ Address chunk_end = chunk->address() + chunk->size();
MemoryChunk* inner = MemoryChunk::FromAddress(
chunk->address() + Page::kPageSize);
- MemoryChunk* inner_last = MemoryChunk::FromAddress(
- chunk->address() + chunk->size() - 1);
+ MemoryChunk* inner_last = MemoryChunk::FromAddress(chunk_end - 1);
while (inner <= inner_last) {
// Size of a large chunk is always a multiple of
// OS::AllocateAlignment() so there is always
// enough space for a fake MemoryChunk header.
+ Address area_end = Min(inner->address() + Page::kPageSize,
chunk_end);
+ // Guard against overflow.
+ if (area_end < inner->address()) area_end = chunk_end;
+ inner->SetArea(inner->address(), area_end);
inner->set_size(Page::kPageSize);
inner->set_owner(lo_space());
inner->SetFlag(MemoryChunk::ABOUT_TO_BE_FREED);
=======================================
--- /branches/bleeding_edge/src/spaces.h Thu Feb 23 04:11:24 2012
+++ /branches/bleeding_edge/src/spaces.h Mon Mar 5 08:39:25 2012
@@ -505,6 +505,11 @@
void set_size(size_t size) {
size_ = size;
}
+
+ void SetArea(Address area_start, Address area_end) {
+ area_start_ = area_start;
+ area_end_ = area_end;
+ }
Executability executable() {
return IsFlagSet(IS_EXECUTABLE) ? EXECUTABLE : NOT_EXECUTABLE;
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
