src/hotspot/share/gc/shenandoah/shenandoahBarrierSet.inline.hpp

*** 40,50 ****
  inline oop ShenandoahBarrierSet::resolve_forwarded_not_null(oop p) {
    return ShenandoahForwarding::get_forwardee(p);
  }
  
  inline oop ShenandoahBarrierSet::resolve_forwarded(oop p) {
!   if (p != NULL) {
      return resolve_forwarded_not_null(p);
    } else {
      return p;
    }
  }
--- 40,50 ----
  inline oop ShenandoahBarrierSet::resolve_forwarded_not_null(oop p) {
    return ShenandoahForwarding::get_forwardee(p);
  }
  
  inline oop ShenandoahBarrierSet::resolve_forwarded(oop p) {
!   if (((HeapWord*) p) != NULL) {
      return resolve_forwarded_not_null(p);
    } else {
      return p;
    }
  }
*** 266,276 ****
    T* end = src + count;
    for (T* elem_ptr = src; elem_ptr < end; elem_ptr++) {
      T o = RawAccess<>::oop_load(elem_ptr);
      if (!CompressedOops::is_null(o)) {
        oop obj = CompressedOops::decode_not_null(o);
!       if (HAS_FWD && cset->is_in(cast_from_oop<HeapWord *>(obj))) {
          assert(_heap->has_forwarded_objects(), "only get here with forwarded objects");
          oop fwd = resolve_forwarded_not_null(obj);
          if (EVAC && obj == fwd) {
            fwd = _heap->evacuate_object(obj, thread);
          }
--- 266,276 ----
    T* end = src + count;
    for (T* elem_ptr = src; elem_ptr < end; elem_ptr++) {
      T o = RawAccess<>::oop_load(elem_ptr);
      if (!CompressedOops::is_null(o)) {
        oop obj = CompressedOops::decode_not_null(o);
!       if (HAS_FWD && cset->is_in((HeapWord *) obj)) {
          assert(_heap->has_forwarded_objects(), "only get here with forwarded objects");
          oop fwd = resolve_forwarded_not_null(obj);
          if (EVAC && obj == fwd) {
            fwd = _heap->evacuate_object(obj, thread);
          }