src/hotspot/share/gc/z/zCollectedHeap.cpp

*** 33,42 ****
--- 33,43 ----
  #include "gc/z/zServiceability.hpp"
  #include "gc/z/zStat.hpp"
  #include "gc/z/zUtils.inline.hpp"
  #include "memory/universe.hpp"
  #include "runtime/mutexLocker.hpp"
+ #include "utilities/align.hpp"
  
  ZCollectedHeap* ZCollectedHeap::heap() {
    CollectedHeap* heap = Universe::heap();
    assert(heap != NULL, "Uninitialized access to ZCollectedHeap::heap()");
    assert(heap->kind() == CollectedHeap::Z, "Invalid name");
*** 367,377 ****
  bool ZCollectedHeap::is_oop(oop object) const {
    return CollectedHeap::is_oop(object) && _heap.is_oop(object);
  }
  
  void ZCollectedHeap::check_oop_location(void* addr) const {
!   assert(check_obj_alignment(addr), "address is not aligned");
  
    const uintptr_t addr_int = reinterpret_cast<uintptr_t>(addr);
    assert(addr_int >= ZAddressSpaceStart, "address is outside of the heap");
    assert(addr_int < ZAddressSpaceEnd,    "address is outside of the heap");
  }
--- 368,378 ----
  bool ZCollectedHeap::is_oop(oop object) const {
    return CollectedHeap::is_oop(object) && _heap.is_oop(object);
  }
  
  void ZCollectedHeap::check_oop_location(void* addr) const {
!   assert(is_object_aligned(addr), "address is not aligned");
  
    const uintptr_t addr_int = reinterpret_cast<uintptr_t>(addr);
    assert(addr_int >= ZAddressSpaceStart, "address is outside of the heap");
    assert(addr_int < ZAddressSpaceEnd,    "address is outside of the heap");
  }