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

*** 143,185 ****
    return result;
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <typename T>
! inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_not_in_heap(oop new_value, T* addr) {
!   oop previous = Raw::oop_atomic_xchg(new_value, addr);
    if (previous != NULL) {
      return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_not_null(previous);
    } else {
      return previous;
    }
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <typename T>
! inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap_impl(oop new_value, T* addr) {
    ShenandoahBarrierSet::barrier_set()->storeval_barrier(new_value);
!   oop result = oop_atomic_xchg_not_in_heap(new_value, addr);
    const bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0;
    if (keep_alive && ShenandoahSATBBarrier && !CompressedOops::is_null(result) &&
        ShenandoahHeap::heap()->is_concurrent_mark_in_progress()) {
      ShenandoahBarrierSet::barrier_set()->enqueue(result);
    }
    return result;
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <typename T>
! inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap(oop new_value, T* addr) {
!   oop result = oop_atomic_xchg_in_heap_impl(new_value, addr);
    keep_alive_if_weak(addr, result);
    return result;
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
! inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap_at(oop new_value, oop base, ptrdiff_t offset) {
!   oop result = oop_atomic_xchg_in_heap_impl(new_value, AccessInternal::oop_field_addr<decorators>(base, offset));
    keep_alive_if_weak(AccessBarrierSupport::resolve_possibly_unknown_oop_ref_strength<decorators>(base, offset), result);
    return result;
  }
  
  // Clone barrier support
--- 143,185 ----
    return result;
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <typename T>
! inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_not_in_heap(T* addr, oop new_value) {
!   oop previous = Raw::oop_atomic_xchg(addr, new_value);
    if (previous != NULL) {
      return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_not_null(previous);
    } else {
      return previous;
    }
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <typename T>
! inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap_impl(T* addr, oop new_value) {
    ShenandoahBarrierSet::barrier_set()->storeval_barrier(new_value);
!   oop result = oop_atomic_xchg_not_in_heap(addr, new_value);
    const bool keep_alive = (decorators & AS_NO_KEEPALIVE) == 0;
    if (keep_alive && ShenandoahSATBBarrier && !CompressedOops::is_null(result) &&
        ShenandoahHeap::heap()->is_concurrent_mark_in_progress()) {
      ShenandoahBarrierSet::barrier_set()->enqueue(result);
    }
    return result;
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <typename T>
! inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap(T* addr, oop new_value) {
!   oop result = oop_atomic_xchg_in_heap_impl(addr, new_value);
    keep_alive_if_weak(addr, result);
    return result;
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
! inline oop ShenandoahBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_atomic_xchg_in_heap_at(oop base, ptrdiff_t offset, oop new_value) {
!   oop result = oop_atomic_xchg_in_heap_impl(AccessInternal::oop_field_addr<decorators>(base, offset), new_value);
    keep_alive_if_weak(AccessBarrierSupport::resolve_possibly_unknown_oop_ref_strength<decorators>(base, offset), result);
    return result;
  }
  
  // Clone barrier support