< prev index next >

src/hotspot/share/gc/z/zBarrierSet.inline.hpp

Print this page
@@ -30,10 +30,11 @@
  #include "gc/z/zAddress.inline.hpp"
  #include "gc/z/zBarrier.inline.hpp"
  #include "gc/z/zIterator.inline.hpp"
  #include "gc/z/zNMethod.hpp"
  #include "memory/iterator.inline.hpp"
+ #include "oops/inlineKlass.inline.hpp"
  #include "utilities/debug.hpp"
  
  template <DecoratorSet decorators, typename BarrierSetT>
  template <DecoratorSet expected>
  inline void ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::verify_decorators_present() {

@@ -327,82 +328,103 @@
  
    return ZBarrier::load_barrier_on_oop_field(src);
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
- inline void ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_copy_one(zpointer* dst, zpointer* src) {
+ inline ZBarrierSet::OopCopyCheckStatus ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_copy_one(zpointer* dst, zpointer* src) {
    const zaddress obj = oop_copy_one_barriers(dst, src);
  
+   if (HasDecorator<decorators, ARRAYCOPY_NOTNULL>::value && is_null(obj)) {
+     return oop_copy_check_null;
+   }
+ 
    Atomic::store(dst, ZAddress::store_good(obj));
+   return oop_copy_check_ok;
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
- inline bool ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_copy_one_check_cast(zpointer* dst, zpointer* src, Klass* dst_klass) {
+ inline ZBarrierSet::OopCopyCheckStatus ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_copy_one_check_cast(zpointer* dst, zpointer* src, Klass* dst_klass) {
    const zaddress obj = oop_copy_one_barriers(dst, src);
+   const bool null_check = HasDecorator<decorators, ARRAYCOPY_NOTNULL>::value;
  
-   if (!oopDesc::is_instanceof_or_null(to_oop(obj), dst_klass)) {
+   if (null_check && is_null(obj)) {
+     return oop_copy_check_null;
+   }
+   else if (!oopDesc::is_instanceof_or_null(to_oop(obj), dst_klass)) {
      // Check cast failed
-     return false;
+     return oop_copy_check_class_cast;
    }
  
    Atomic::store(dst, ZAddress::store_good(obj));
  
-   return true;
+   return oop_copy_check_ok;
  }
  
  
  template <DecoratorSet decorators, typename BarrierSetT>
- inline bool ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap_check_cast(zpointer* dst, zpointer* src, size_t length, Klass* dst_klass) {
+ inline ZBarrierSet::OopCopyCheckStatus ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap_check_cast(zpointer* dst, zpointer* src, size_t length, Klass* dst_klass) {
    // Check cast and copy each elements
-   for (const zpointer* const end = src + length; src < end; src++, dst++) {
-     if (!oop_copy_one_check_cast(dst, src, dst_klass)) {
-       // Check cast failed
-       return false;
-     }
+   OopCopyCheckStatus check_status = oop_copy_check_ok;
+   for (const zpointer* const end = src + length; (check_status == oop_copy_check_ok) && (src < end); src++, dst++) {
+     check_status = oop_copy_one_check_cast(dst, src, dst_klass);
    }
- 
-   return true;
+   return check_status;
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
- inline bool ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap_no_check_cast(zpointer* dst, zpointer* src, size_t length) {
+ inline ZBarrierSet::OopCopyCheckStatus ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap_no_check_cast(zpointer* dst, zpointer* src, size_t length) {
    const bool is_disjoint = HasDecorator<decorators, ARRAYCOPY_DISJOINT>::value;
- 
+   OopCopyCheckStatus check_status = oop_copy_check_ok;
    if (is_disjoint || src > dst) {
-     for (const zpointer* const end = src + length; src < end; src++, dst++) {
-       oop_copy_one(dst, src);
+     for (const zpointer* const end = src + length; (check_status == oop_copy_check_ok) && (src < end); src++, dst++) {
+       check_status = oop_copy_one(dst, src);
      }
-     return true;
+     return check_status;
    }
  
    if (src < dst) {
      const zpointer* const end = src;
      src += length - 1;
      dst += length - 1;
-     for ( ; src >= end; src--, dst--) {
-       oop_copy_one(dst, src);
+     for ( ; (check_status == oop_copy_check_ok) && (src >= end); src--, dst--) {
+       check_status = oop_copy_one(dst, src);
      }
-     return true;
+     return check_status;
    }
  
    // src and dst are the same; nothing to do
-   return true;
+   return check_status;
  }
  
  template <DecoratorSet decorators, typename BarrierSetT>
- inline bool ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, zpointer* src_raw,
+ inline void ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_arraycopy_in_heap(arrayOop src_obj, size_t src_offset_in_bytes, zpointer* src_raw,
                                                                                         arrayOop dst_obj, size_t dst_offset_in_bytes, zpointer* dst_raw,
                                                                                         size_t length) {
    zpointer* const src = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
    zpointer* const dst = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
+   OopCopyCheckStatus check_status;
  
    if (HasDecorator<decorators, ARRAYCOPY_CHECKCAST>::value) {
      Klass* const dst_klass = objArrayOop(dst_obj)->element_klass();
-     return oop_arraycopy_in_heap_check_cast(dst, src, length, dst_klass);
+     check_status = oop_arraycopy_in_heap_check_cast(dst, src, length, dst_klass);
+   } else {
+     check_status = oop_arraycopy_in_heap_no_check_cast(dst, src, length);
    }
  
-   return oop_arraycopy_in_heap_no_check_cast(dst, src, length);
+   switch (check_status) {
+   case oop_copy_check_ok:
+     return;
+   case oop_copy_check_class_cast:
+     throw_array_store_exception(src_obj, dst_obj, JavaThread::current());
+     break;
+   case oop_copy_check_null:
+     throw_array_null_pointer_store_exception(src_obj, dst_obj, JavaThread::current());
+     break;
+   default:
+     ShouldNotReachHere();
+     return;
+   }
  }
  
  class ZColorStoreGoodOopClosure : public BasicOopIterateClosure {
  public:
    virtual void do_oop(oop* p_) {

@@ -455,10 +477,30 @@
    // Color store good before handing out
    ZColorStoreGoodOopClosure cl_sg;
    ZIterator::oop_iterate(dst, &cl_sg);
  }
  
+ template <DecoratorSet decorators, typename BarrierSetT>
+ inline void ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::value_copy_in_heap(void* src, void* dst, InlineKlass* md, LayoutKind lk) {
+   if (md->contains_oops()) {
+     // src/dst aren't oops, need offset to adjust oop map offset
+     const address src_oop_addr_offset = ((address) src) - md->first_field_offset();
+ 
+     OopMapBlock* map = md->start_of_nonstatic_oop_maps();
+     const OopMapBlock* const end = map + md->nonstatic_oop_map_count();
+     while (map != end) {
+       const address soop_address = src_oop_addr_offset + map->offset();
+       zpointer *p = (zpointer*) soop_address;
+       for (const zpointer* const end = p + map->count(); p < end; p++) {
+         ZBarrier::load_barrier_on_oop_field(p);
+       }
+       map++;
+     }
+   }
+   Raw::value_copy_in_heap(src, dst, md, lk);
+ }
+ 
  //
  // Not in heap
  //
  template <DecoratorSet decorators, typename BarrierSetT>
  inline oop ZBarrierSet::AccessBarrier<decorators, BarrierSetT>::oop_load_not_in_heap(zpointer* p) {
< prev index next >