src/hotspot/share/gc/shared/modRefBarrierSet.hpp

@@ -68,11 +68,10 @@
    // at the address "start", which may not necessarily be HeapWord-aligned
    inline void write_ref_array(HeapWord* start, size_t count);
  
   protected:
    virtual void write_ref_array_work(MemRegion mr) = 0;
- 
   public:
    // The ModRef abstraction introduces pre and post barriers
    template <DecoratorSet decorators, typename BarrierSetT>
    class AccessBarrier: public BarrierSet::AccessBarrier<decorators, BarrierSetT> {
      typedef BarrierSet::AccessBarrier<decorators, BarrierSetT> Raw;

@@ -84,14 +83,18 @@
      static oop oop_atomic_cmpxchg_in_heap(T* addr, oop compare_value, oop new_value);
      template <typename T>
      static oop oop_atomic_xchg_in_heap(T* addr, oop new_value);
  
      template <typename T>
-     static bool oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
+     static void oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, T* src_raw,
                                        arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
                                        size_t length);
- 
+   private:
+     // Failing checkcast or check null during copy, still needs barrier
+     template <typename T>
+     static inline void oop_arraycopy_partial_barrier(BarrierSetT *bs, T* dst_raw, T* p);
+   public:
      static void clone_in_heap(oop src, oop dst, size_t size);
  
      static void oop_store_in_heap_at(oop base, ptrdiff_t offset, oop value) {
        oop_store_in_heap(AccessInternal::oop_field_addr<decorators>(base, offset), value);
      }

@@ -101,10 +104,12 @@
      }
  
      static oop oop_atomic_cmpxchg_in_heap_at(oop base, ptrdiff_t offset, oop compare_value, oop new_value) {
        return oop_atomic_cmpxchg_in_heap(AccessInternal::oop_field_addr<decorators>(base, offset), compare_value, new_value);
      }
+ 
+     static void value_copy_in_heap(void* src, void* dst, InlineKlass* md);
    };
  };
  
  template<>
  struct BarrierSet::GetName<ModRefBarrierSet> {