| Index: runtime/vm/gc_marker.cc
|
| ===================================================================
|
| --- runtime/vm/gc_marker.cc (revision 9135)
|
| +++ runtime/vm/gc_marker.cc (working copy)
|
| @@ -168,13 +168,8 @@
|
| return;
|
| }
|
|
|
| - uword raw_addr = RawObject::ToAddr(raw_obj);
|
| - // TODO(iposva): Premark vm_isolate objects, to avoid this extra check here.
|
| - if (vm_heap_->Contains(raw_addr)) {
|
| - return;
|
| - }
|
| // TODO(iposva): merge old and code spaces.
|
| - ASSERT(page_space_->Contains(raw_addr));
|
| + ASSERT(page_space_->Contains(RawObject::ToAddr(raw_obj)));
|
| MarkAndPush(raw_obj);
|
| }
|
|
|
| @@ -191,6 +186,9 @@
|
| if (!raw_obj->IsHeapObject()) {
|
| return false;
|
| }
|
| + if (raw_obj == Object::null()) {
|
| + return true;
|
| + }
|
| if (!raw_obj->IsOldObject()) {
|
| return false;
|
| }
|
|
|