src/hotspot/share/gc/shenandoah/shenandoahVerifier.cpp

*** 33,42 ****
--- 33,43 ----
  #include "gc/shenandoah/shenandoahVerifier.hpp"
  #include "memory/allocation.hpp"
  #include "memory/iterator.inline.hpp"
  #include "memory/resourceArea.hpp"
  #include "oops/compressedOops.inline.hpp"
+ #include "utilities/align.hpp"
  
  // Avoid name collision on verify_oop (defined in macroAssembler_arm.hpp)
  #ifdef verify_oop
  #undef verify_oop
  #endif
*** 96,106 ****
      // that failure report would not try to touch something that was not yet verified to be
      // safe to process.
  
      check(ShenandoahAsserts::_safe_unknown, obj, _heap->is_in(obj),
                "oop must be in heap");
!     check(ShenandoahAsserts::_safe_unknown, obj, check_obj_alignment(obj),
                "oop must be aligned");
  
      ShenandoahHeapRegion *obj_reg = _heap->heap_region_containing(obj);
      Klass* obj_klass = obj->klass_or_null();
  
--- 97,107 ----
      // that failure report would not try to touch something that was not yet verified to be
      // safe to process.
  
      check(ShenandoahAsserts::_safe_unknown, obj, _heap->is_in(obj),
                "oop must be in heap");
!     check(ShenandoahAsserts::_safe_unknown, obj, is_object_aligned(obj),
                "oop must be aligned");
  
      ShenandoahHeapRegion *obj_reg = _heap->heap_region_containing(obj);
      Klass* obj_klass = obj->klass_or_null();
  
*** 156,166 ****
      if (obj != fwd) {
        check(ShenandoahAsserts::_safe_oop, obj, _heap->is_in(fwd),
               "Forwardee must be in heap");
        check(ShenandoahAsserts::_safe_oop, obj, !CompressedOops::is_null(fwd),
               "Forwardee is set");
!       check(ShenandoahAsserts::_safe_oop, obj, check_obj_alignment(fwd),
               "Forwardee must be aligned");
  
        // Do this before touching fwd->size()
        Klass* fwd_klass = fwd->klass_or_null();
        check(ShenandoahAsserts::_safe_oop, obj, fwd_klass != NULL,
--- 157,167 ----
      if (obj != fwd) {
        check(ShenandoahAsserts::_safe_oop, obj, _heap->is_in(fwd),
               "Forwardee must be in heap");
        check(ShenandoahAsserts::_safe_oop, obj, !CompressedOops::is_null(fwd),
               "Forwardee is set");
!       check(ShenandoahAsserts::_safe_oop, obj, is_object_aligned(fwd),
               "Forwardee must be aligned");
  
        // Do this before touching fwd->size()
        Klass* fwd_klass = fwd->klass_or_null();
        check(ShenandoahAsserts::_safe_oop, obj, fwd_klass != NULL,