Before a scavenge collection in debug builds with ENABLE_SLOW_ASSERTS,
we verify that there are no pointers to new space from the code space. Add the old data space to this verification. Review URL: http://codereview.chromium.org/113095 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1897 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
3dc6701516
commit
3299f63c0d
38
src/heap.cc
38
src/heap.cc
@ -554,24 +554,34 @@ class VerifyNonPointerSpacePointersVisitor: public ObjectVisitor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
static void VerifyNonPointerSpacePointers() {
|
||||||
|
// Verify that there are no pointers to new space in spaces where we
|
||||||
|
// do not expect them.
|
||||||
|
VerifyNonPointerSpacePointersVisitor v;
|
||||||
|
HeapObjectIterator code_it(Heap::code_space());
|
||||||
|
while (code_it.has_next()) {
|
||||||
|
HeapObject* object = code_it.next();
|
||||||
|
if (object->IsCode()) {
|
||||||
|
Code::cast(object)->ConvertICTargetsFromAddressToObject();
|
||||||
|
object->Iterate(&v);
|
||||||
|
Code::cast(object)->ConvertICTargetsFromObjectToAddress();
|
||||||
|
} else {
|
||||||
|
// If we find non-code objects in code space (e.g., free list
|
||||||
|
// nodes) we want to verify them as well.
|
||||||
|
object->Iterate(&v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
HeapObjectIterator data_it(Heap::old_data_space());
|
||||||
|
while (data_it.has_next()) data_it.next()->Iterate(&v);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void Heap::Scavenge() {
|
void Heap::Scavenge() {
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if (FLAG_enable_slow_asserts) {
|
if (FLAG_enable_slow_asserts) VerifyNonPointerSpacePointers();
|
||||||
VerifyNonPointerSpacePointersVisitor v;
|
|
||||||
HeapObjectIterator it(code_space_);
|
|
||||||
while (it.has_next()) {
|
|
||||||
HeapObject* object = it.next();
|
|
||||||
if (object->IsCode()) {
|
|
||||||
Code::cast(object)->ConvertICTargetsFromAddressToObject();
|
|
||||||
}
|
|
||||||
object->Iterate(&v);
|
|
||||||
if (object->IsCode()) {
|
|
||||||
Code::cast(object)->ConvertICTargetsFromObjectToAddress();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
gc_state_ = SCAVENGE;
|
gc_state_ = SCAVENGE;
|
||||||
|
Loading…
Reference in New Issue
Block a user