From b832d8e089775c429c1bf9173505764ed9f73aba Mon Sep 17 00:00:00 2001 From: "hpayer@chromium.org" Date: Thu, 25 Jul 2013 12:10:45 +0000 Subject: [PATCH] Ignore external strings in old pointer space migration invariant check. BUG= R=jkummerow@chromium.org Review URL: https://codereview.chromium.org/20142008 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@15880 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/mark-compact.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mark-compact.cc b/src/mark-compact.cc index fb546bf..59492e1 100644 --- a/src/mark-compact.cc +++ b/src/mark-compact.cc @@ -2742,8 +2742,9 @@ void MarkCompactCollector::MigrateObject(Address dst, CHECK(dest != LO_SPACE && size <= Page::kMaxNonCodeHeapObjectSize); if (dest == OLD_POINTER_SPACE) { // TODO(hpayer): Replace this check with an assert. - CHECK(heap_->TargetSpace(HeapObject::FromAddress(src)) == - heap_->old_pointer_space()); + HeapObject* heap_object = HeapObject::FromAddress(src); + CHECK(heap_object->IsExternalString() || + heap_->TargetSpace(heap_object) == heap_->old_pointer_space()); Address src_slot = src; Address dst_slot = dst; ASSERT(IsAligned(size, kPointerSize)); -- 2.7.4