| Index: src/heap.h
|
| diff --git a/src/heap.h b/src/heap.h
|
| index e0ff0c78fbf6f52707d5e2e6fa331c3e29cc0d10..9ccbe6613654d4697c38cf9f48c98e4ab7a24ce8 100644
|
| --- a/src/heap.h
|
| +++ b/src/heap.h
|
| @@ -767,7 +767,7 @@ class Heap {
|
|
|
| // Ensure that we have swept all spaces in such a way that we can iterate
|
| // over all objects. May cause a GC.
|
| - void MakeHeapIterable();
|
| + void EnsureHeapIsIterable();
|
|
|
| // Notify the heap that a context has been disposed.
|
| int NotifyContextDisposed();
|
| @@ -2391,9 +2391,6 @@ class SpaceIterator : public Malloced {
|
| // aggregates the specific iterators for the different spaces as
|
| // these can only iterate over one space only.
|
| //
|
| -// HeapIterator ensures there is no allocation during its lifetime
|
| -// (using an embedded DisallowHeapAllocation instance).
|
| -//
|
| // HeapIterator can skip free list nodes (that is, de-allocated heap
|
| // objects that still remain in the heap). As implementation of free
|
| // nodes filtering uses GC marks, it can't be used during MS/MC GC
|
| @@ -2416,18 +2413,12 @@ class HeapIterator BASE_EMBEDDED {
|
| void reset();
|
|
|
| private:
|
| - struct MakeHeapIterableHelper {
|
| - explicit MakeHeapIterableHelper(Heap* heap) { heap->MakeHeapIterable(); }
|
| - };
|
| -
|
| // Perform the initialization.
|
| void Init();
|
| // Perform all necessary shutdown (destruction) work.
|
| void Shutdown();
|
| HeapObject* NextObject();
|
|
|
| - MakeHeapIterableHelper make_heap_iterable_helper_;
|
| - DisallowHeapAllocation no_heap_allocation_;
|
| Heap* heap_;
|
| HeapObjectsFiltering filtering_;
|
| HeapObjectsFilter* filter_;
|
|
|