src/hotspot/share/gc/shared/barrierSet.inline.hpp

*** 38,21 ***
                                                                                                 arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
                                                                                                 size_t length) {
    T* src = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
    T* dst = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
  
!   if (!HasDecorator<decorators, ARRAYCOPY_CHECKCAST>::value) {
      // Covariant, copy without checks
      Raw::oop_arraycopy(nullptr, 0, src, nullptr, 0, dst, length);
      return OopCopyResult::ok;
    }
  
    // Copy each element with checking casts
    Klass* const dst_klass = objArrayOop(dst_obj)->element_klass();
    for (const T* const end = src + length; src < end; src++, dst++) {
      const T elem = *src;
!     if (!oopDesc::is_instanceof_or_null(CompressedOops::decode(elem), dst_klass)) {
        return OopCopyResult::failed_check_class_cast;
      }
      *dst = elem;
    }
  
--- 38,27 ---
                                                                                                 arrayOop dst_obj, size_t dst_offset_in_bytes, T* dst_raw,
                                                                                                 size_t length) {
    T* src = arrayOopDesc::obj_offset_to_raw(src_obj, src_offset_in_bytes, src_raw);
    T* dst = arrayOopDesc::obj_offset_to_raw(dst_obj, dst_offset_in_bytes, dst_raw);
  
!   if ((!HasDecorator<decorators, ARRAYCOPY_CHECKCAST>::value) &&
+       (!HasDecorator<decorators, ARRAYCOPY_NOTNULL>::value)) {
      // Covariant, copy without checks
      Raw::oop_arraycopy(nullptr, 0, src, nullptr, 0, dst, length);
+ 
      return OopCopyResult::ok;
    }
  
    // Copy each element with checking casts
    Klass* const dst_klass = objArrayOop(dst_obj)->element_klass();
    for (const T* const end = src + length; src < end; src++, dst++) {
      const T elem = *src;
!     if (HasDecorator<decorators, ARRAYCOPY_NOTNULL>::value && CompressedOops::is_null(elem)) {
+       return OopCopyResult::failed_check_null;
+     }
+     if (HasDecorator<decorators, ARRAYCOPY_CHECKCAST>::value &&
+         !oopDesc::is_instanceof_or_null(CompressedOops::decode(elem), dst_klass)) {
        return OopCopyResult::failed_check_class_cast;
      }
      *dst = elem;
    }