From 34417e1d0f62bbb11c0005d4d18c6e28745cf452 Mon Sep 17 00:00:00 2001 From: "mstarzinger@chromium.org" Date: Wed, 21 Aug 2013 13:39:20 +0000 Subject: [PATCH] Cleanup FooSpace::VerifyObject and ElementsAccessor::Validate. R=danno@chromium.org Review URL: https://codereview.chromium.org/23273004 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16259 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/elements.cc | 8 +------- src/spaces.cc | 11 +++-------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/elements.cc b/src/elements.cc index 77abf4e..5cef12b 100644 --- a/src/elements.cc +++ b/src/elements.cc @@ -581,14 +581,8 @@ class ElementsAccessorBase : public ElementsAccessor { // When objects are first allocated, its elements are Failures. if (fixed_array_base->IsFailure()) return; if (!fixed_array_base->IsHeapObject()) return; - Map* map = fixed_array_base->map(); // Arrays that have been shifted in place can't be verified. - Heap* heap = holder->GetHeap(); - if (map == heap->one_pointer_filler_map() || - map == heap->two_pointer_filler_map() || - map == heap->free_space_map()) { - return; - } + if (fixed_array_base->IsFiller()) return; int length = 0; if (holder->IsJSArray()) { Object* length_obj = JSArray::cast(holder)->length(); diff --git a/src/spaces.cc b/src/spaces.cc index 5935c4a..8a5aa03 100644 --- a/src/spaces.cc +++ b/src/spaces.cc @@ -2852,8 +2852,7 @@ void FixedSpace::PrepareForMarkCompact() { // the VerifyObject definition behind VERIFY_HEAP. void MapSpace::VerifyObject(HeapObject* object) { - // The object should be a map or a free-list node. - CHECK(object->IsMap() || object->IsFreeSpace()); + CHECK(object->IsMap()); } @@ -2864,16 +2863,12 @@ void MapSpace::VerifyObject(HeapObject* object) { // the VerifyObject definition behind VERIFY_HEAP. void CellSpace::VerifyObject(HeapObject* object) { - // The object should be a global object property cell or a free-list node. - CHECK(object->IsCell() || - object->map() == heap()->two_pointer_filler_map()); + CHECK(object->IsCell()); } void PropertyCellSpace::VerifyObject(HeapObject* object) { - // The object should be a global object property cell or a free-list node. - CHECK(object->IsPropertyCell() || - object->map() == heap()->two_pointer_filler_map()); + CHECK(object->IsPropertyCell()); } -- 2.7.4