diff options
Diffstat (limited to 'runtime/gc/heap.h')
| -rw-r--r-- | runtime/gc/heap.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h index cc48172f71..e23b1a3166 100644 --- a/runtime/gc/heap.h +++ b/runtime/gc/heap.h @@ -580,9 +580,9 @@ class Heap { // Unbind any bound bitmaps. void UnBindBitmaps() REQUIRES(Locks::heap_bitmap_lock_); - // DEPRECATED: Should remove in "near" future when support for multiple image spaces is added. - // Assumes there is only one image space. - space::ImageSpace* GetImageSpace() const; + // Returns the boot image space. There may be multiple image spaces, but there is only one boot + // image space. + space::ImageSpace* GetBootImageSpace() const; // Permenantly disable moving garbage collection. void DisableMovingGc() REQUIRES(!*gc_complete_lock_); @@ -660,7 +660,9 @@ class Heap { void RemoveRememberedSet(space::Space* space); bool IsCompilingBoot() const; - bool HasImageSpace() const; + bool HasImageSpace() const { + return boot_image_space_ != nullptr; + } ReferenceProcessor* GetReferenceProcessor() { return reference_processor_.get(); @@ -1320,6 +1322,9 @@ class Heap { // allocating. bool gc_disabled_for_shutdown_ GUARDED_BY(gc_complete_lock_); + // Boot image space. + space::ImageSpace* boot_image_space_; + friend class CollectorTransitionTask; friend class collector::GarbageCollector; friend class collector::MarkCompact; |