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

*** 21,11 ***
   * questions.
   *
   */
  
  #include "gc/shenandoah/shenandoahBarrierSet.inline.hpp"
- #include "gc/shenandoah/shenandoahBarrierSetClone.inline.hpp"
  #include "gc/shenandoah/shenandoahRuntime.hpp"
  #include "gc/shenandoah/shenandoahThreadLocalData.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/interfaceSupport.inline.hpp"
  #include "utilities/copy.hpp"
--- 21,10 ---

*** 47,33 ***
    SATBMarkQueue& queue = ShenandoahThreadLocalData::satb_mark_queue(thread);
    ShenandoahBarrierSet::satb_mark_queue_set().enqueue_known_active(queue, orig);
  JRT_END
  
  JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_strong(oopDesc* src, oop* load_addr))
!   return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_mutator(src, load_addr);
  JRT_END
  
  JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_strong_narrow(oopDesc* src, narrowOop* load_addr))
!   return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_mutator(src, load_addr);
  JRT_END
  
  JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_weak(oopDesc* src, oop* load_addr))
!   return (oopDesc*) ShenandoahBarrierSet::barrier_set()->load_reference_barrier<oop>(ON_WEAK_OOP_REF, oop(src), load_addr);
  JRT_END
  
  JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_weak_narrow(oopDesc* src, narrowOop* load_addr))
!   return (oopDesc*) ShenandoahBarrierSet::barrier_set()->load_reference_barrier<narrowOop>(ON_WEAK_OOP_REF, oop(src), load_addr);
  JRT_END
  
  JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_phantom(oopDesc* src, oop* load_addr))
!   return (oopDesc*) ShenandoahBarrierSet::barrier_set()->load_reference_barrier<oop>(ON_PHANTOM_OOP_REF, oop(src), load_addr);
  JRT_END
  
  JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_phantom_narrow(oopDesc* src, narrowOop* load_addr))
!   return (oopDesc*) ShenandoahBarrierSet::barrier_set()->load_reference_barrier<narrowOop>(ON_PHANTOM_OOP_REF, oop(src), load_addr);
  JRT_END
  
! JRT_LEAF(void, ShenandoahRuntime::clone_barrier(oopDesc* src))
!   oop s = oop(src);
-   shenandoah_assert_correct(nullptr, s);
-   ShenandoahBarrierSet::barrier_set()->clone_barrier(s);
  JRT_END
--- 46,31 ---
    SATBMarkQueue& queue = ShenandoahThreadLocalData::satb_mark_queue(thread);
    ShenandoahBarrierSet::satb_mark_queue_set().enqueue_known_active(queue, orig);
  JRT_END
  
  JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_strong(oopDesc* src, oop* load_addr))
!   return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_mutator<ON_STRONG_OOP_REF, oop>(src, load_addr);
  JRT_END
  
  JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_strong_narrow(oopDesc* src, narrowOop* load_addr))
!   return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_mutator<ON_STRONG_OOP_REF, narrowOop>(src, load_addr);
  JRT_END
  
  JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_weak(oopDesc* src, oop* load_addr))
!   return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_mutator<ON_WEAK_OOP_REF, oop>(src, load_addr);
  JRT_END
  
  JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_weak_narrow(oopDesc* src, narrowOop* load_addr))
!   return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_mutator<ON_WEAK_OOP_REF, narrowOop>(src, load_addr);
  JRT_END
  
  JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_phantom(oopDesc* src, oop* load_addr))
!   return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_mutator<ON_PHANTOM_OOP_REF, oop>(src, load_addr);
  JRT_END
  
  JRT_LEAF(oopDesc*, ShenandoahRuntime::load_reference_barrier_phantom_narrow(oopDesc* src, narrowOop* load_addr))
!   return ShenandoahBarrierSet::barrier_set()->load_reference_barrier_mutator<ON_PHANTOM_OOP_REF, narrowOop>(src, load_addr);
  JRT_END
  
! JRT_LEAF(void, ShenandoahRuntime::clone(oopDesc* src, oopDesc* dst, size_t size))
!   HeapAccess<>::clone(src, dst, size);
  JRT_END