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

rev 57097 : 8234768: Shenandoah: Streamline enqueueing runtime barriers

*** 75,105 ****
    inline void arraycopy_update(oop* src, size_t count);
    inline void arraycopy_update(narrowOop* src, size_t count);
    inline void clone_barrier(oop src);
    void clone_barrier_runtime(oop src);
  
-   // We export this to make it available in cases where the static
-   // type of the barrier set is known.  Note that it is non-virtual.
-   template <class T> inline void inline_write_ref_field_pre(T* field, oop new_val);
- 
-   // These are the more general virtual versions.
-   void write_ref_field_pre_work(oop* field, oop new_val);
-   void write_ref_field_pre_work(narrowOop* field, oop new_val);
-   void write_ref_field_pre_work(void* field, oop new_val);
- 
-   void write_ref_field_work(void* v, oop o, bool release = false);
- 
    virtual void on_thread_create(Thread* thread);
    virtual void on_thread_destroy(Thread* thread);
    virtual void on_thread_attach(Thread* thread);
    virtual void on_thread_detach(Thread* thread);
  
    static inline oop resolve_forwarded_not_null(oop p);
    static inline oop resolve_forwarded(oop p);
  
!   void storeval_barrier(oop obj);
!   void keep_alive_barrier(oop obj);
  
    oop load_reference_barrier(oop obj);
    oop load_reference_barrier_not_null(oop obj);
  
    oop load_reference_barrier_mutator(oop obj, oop* load_addr);
--- 75,103 ----
    inline void arraycopy_update(oop* src, size_t count);
    inline void arraycopy_update(narrowOop* src, size_t count);
    inline void clone_barrier(oop src);
    void clone_barrier_runtime(oop src);
  
    virtual void on_thread_create(Thread* thread);
    virtual void on_thread_destroy(Thread* thread);
    virtual void on_thread_attach(Thread* thread);
    virtual void on_thread_detach(Thread* thread);
  
    static inline oop resolve_forwarded_not_null(oop p);
    static inline oop resolve_forwarded(oop p);
  
!   template <DecoratorSet decorators, typename T>
!   inline void satb_barrier(T* field);
!   inline void satb_enqueue(oop value);
!   inline void storeval_barrier(oop obj);
! 
!   template <DecoratorSet decorators>
!   inline void keep_alive_if_weak(oop value);
!   inline void keep_alive_if_weak(DecoratorSet decorators, oop value);
!   inline void keep_alive_barrier(oop value);
! 
!   inline void enqueue(oop obj);
  
    oop load_reference_barrier(oop obj);
    oop load_reference_barrier_not_null(oop obj);
  
    oop load_reference_barrier_mutator(oop obj, oop* load_addr);
*** 109,120 ****
    oop load_reference_barrier_mutator_work(oop obj, T* load_addr);
  
    oop load_reference_barrier_native(oop obj, oop* load_addr);
    oop load_reference_barrier_native(oop obj, narrowOop* load_addr);
  
-   void enqueue(oop obj);
- 
  private:
    template <class T>
    inline void arraycopy_pre_work(T* src, T* dst, size_t count);
    template <class T, bool HAS_FWD, bool EVAC, bool ENQUEUE>
    inline void arraycopy_work(T* src, size_t count);
--- 107,116 ----
*** 124,154 ****
    oop load_reference_barrier_impl(oop obj);
  
    template <class T>
    oop load_reference_barrier_native_impl(oop obj, T* load_addr);
  
-   static void keep_alive_if_weak(DecoratorSet decorators, oop value) {
-     assert((decorators & ON_UNKNOWN_OOP_REF) == 0, "Reference strength must be known");
-     const bool on_strong_oop_ref = (decorators & ON_STRONG_OOP_REF) != 0;
-     const bool peek              = (decorators & AS_NO_KEEPALIVE) != 0;
-     if (!peek && !on_strong_oop_ref && value != NULL) {
-       ShenandoahBarrierSet::barrier_set()->keep_alive_barrier(value);
-     }
-   }
- 
  public:
    // Callbacks for runtime accesses.
    template <DecoratorSet decorators, typename BarrierSetT = ShenandoahBarrierSet>
    class AccessBarrier: public BarrierSet::AccessBarrier<decorators, BarrierSetT> {
      typedef BarrierSet::AccessBarrier<decorators, BarrierSetT> Raw;
  
-     template <typename T>
-     static oop oop_atomic_cmpxchg_in_heap_impl(T* addr, oop compare_value, oop new_value);
- 
-     template <typename T>
-     static oop oop_atomic_xchg_in_heap_impl(T* addr, oop new_value);
- 
    public:
      // Heap oop accesses. These accessors get resolved when
      // IN_HEAP is set (e.g. when using the HeapAccess API), it is
      // an oop_* overload, and the barrier strength is AS_NORMAL.
      template <typename T>
--- 120,135 ----