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

*** 34,45 ****
    return get_forwardee_raw_unchecked(obj);
  }
  
  inline HeapWord* ShenandoahForwarding::get_forwardee_raw_unchecked(oop obj) {
    markWord mark = obj->mark_raw();
!   if (mark->is_marked()) {
!     return (HeapWord*) mark->clear_lock_bits();
    } else {
      return (HeapWord*) obj;
    }
  }
  
--- 34,45 ----
    return get_forwardee_raw_unchecked(obj);
  }
  
  inline HeapWord* ShenandoahForwarding::get_forwardee_raw_unchecked(oop obj) {
    markWord mark = obj->mark_raw();
!   if (mark.is_marked()) {
!     return (HeapWord*) mark.clear_lock_bits().to_pointer();
    } else {
      return (HeapWord*) obj;
    }
  }
  
*** 47,70 ****
    shenandoah_assert_correct(NULL, obj);
    return oop(get_forwardee_raw_unchecked(obj));
  }
  
  inline bool ShenandoahForwarding::is_forwarded(oop obj) {
!   return obj->mark_raw()->is_marked();
  }
  
  inline oop ShenandoahForwarding::try_update_forwardee(oop obj, oop update) {
    markWord old_mark = obj->mark_raw();
!   if (old_mark->is_marked()) {
!     return oop(reinterpret_cast<oopDesc*>(old_mark->clear_lock_bits()));
    }
  
    markWord new_mark = markWord::encode_pointer_as_mark(update);
    markWord prev_mark = obj->cas_set_mark_raw(new_mark, old_mark);
    if (prev_mark == old_mark) {
      return update;
    } else {
!     return oop(reinterpret_cast<oopDesc*>(prev_mark->clear_lock_bits()));
    }
  }
  
  #endif // SHARE_GC_SHENANDOAH_SHENANDOAHFORWARDING_INLINE_HPP
--- 47,70 ----
    shenandoah_assert_correct(NULL, obj);
    return oop(get_forwardee_raw_unchecked(obj));
  }
  
  inline bool ShenandoahForwarding::is_forwarded(oop obj) {
!   return obj->mark_raw().is_marked();
  }
  
  inline oop ShenandoahForwarding::try_update_forwardee(oop obj, oop update) {
    markWord old_mark = obj->mark_raw();
!   if (old_mark.is_marked()) {
!     return oop(old_mark.clear_lock_bits().to_pointer());
    }
  
    markWord new_mark = markWord::encode_pointer_as_mark(update);
    markWord prev_mark = obj->cas_set_mark_raw(new_mark, old_mark);
    if (prev_mark == old_mark) {
      return update;
    } else {
!     return oop(prev_mark.clear_lock_bits().to_pointer());
    }
  }
  
  #endif // SHARE_GC_SHENANDOAH_SHENANDOAHFORWARDING_INLINE_HPP