| Index: runtime/vm/scavenger.cc
|
| diff --git a/runtime/vm/scavenger.cc b/runtime/vm/scavenger.cc
|
| index 17b95f229d2d999be1d9a65b9dfcc7108311d90a..efcdf74c0f41a484141b873fdf7704d1dec4c2c8 100644
|
| --- a/runtime/vm/scavenger.cc
|
| +++ b/runtime/vm/scavenger.cc
|
| @@ -408,7 +408,11 @@ void Scavenger::IterateStoreBuffers(Isolate* isolate,
|
| void Scavenger::IterateObjectIdTable(Isolate* isolate,
|
| ScavengerVisitor* visitor) {
|
| ObjectIdRing* ring = isolate->object_id_ring();
|
| - ASSERT(ring != NULL);
|
| + if (ring == NULL) {
|
| + // --gc_at_alloc can get us here before the ring has been initialized.
|
| + ASSERT(FLAG_gc_at_alloc);
|
| + return;
|
| + }
|
| ring->VisitPointers(visitor);
|
| }
|
|
|
|
|