src/hotspot/share/gc/z/zPageTable.hpp

*** 22,44 ****
   */
  
  #ifndef SHARE_GC_Z_ZPAGETABLE_HPP
  #define SHARE_GC_Z_ZPAGETABLE_HPP
  
! #include "gc/z/zAddressRangeMap.hpp"
! #include "gc/z/zGlobals.hpp"
  #include "gc/z/zPageTableEntry.hpp"
  #include "memory/allocation.hpp"
  
  class ZPage;
  
  class ZPageTable {
    friend class VMStructs;
    friend class ZPageTableIterator;
  
  private:
!   ZAddressRangeMap<ZPageTableEntry, ZGranuleSizeShift> _map;
  
    ZPageTableEntry get_entry(ZPage* page) const;
    void put_entry(ZPage* page, ZPageTableEntry entry);
  
  public:
--- 22,43 ----
   */
  
  #ifndef SHARE_GC_Z_ZPAGETABLE_HPP
  #define SHARE_GC_Z_ZPAGETABLE_HPP
  
! #include "gc/z/zGranuleMap.hpp"
  #include "gc/z/zPageTableEntry.hpp"
  #include "memory/allocation.hpp"
  
  class ZPage;
  
  class ZPageTable {
    friend class VMStructs;
    friend class ZPageTableIterator;
  
  private:
!   ZGranuleMap<ZPageTableEntry> _map;
  
    ZPageTableEntry get_entry(ZPage* page) const;
    void put_entry(ZPage* page, ZPageTableEntry entry);
  
  public:
*** 53,64 ****
    void clear_relocating(ZPage* page);
  };
  
  class ZPageTableIterator : public StackObj {
  private:
!   ZAddressRangeMapIterator<ZPageTableEntry, ZGranuleSizeShift> _iter;
!   ZPage*                                                       _prev;
  
  public:
    ZPageTableIterator(const ZPageTable* pagetable);
  
    bool next(ZPage** page);
--- 52,63 ----
    void clear_relocating(ZPage* page);
  };
  
  class ZPageTableIterator : public StackObj {
  private:
!   ZGranuleMapIterator<ZPageTableEntry> _iter;
!   ZPage*                               _prev;
  
  public:
    ZPageTableIterator(const ZPageTable* pagetable);
  
    bool next(ZPage** page);