src/hotspot/share/oops/accessBackend.inline.hpp

*** 25,58 ****
  #ifndef SHARE_VM_RUNTIME_ACCESSBACKEND_INLINE_HPP
  #define SHARE_VM_RUNTIME_ACCESSBACKEND_INLINE_HPP
  
  #include "oops/access.hpp"
  #include "oops/accessBackend.hpp"
! #include "oops/oop.inline.hpp"
  
  template <DecoratorSet decorators>
  template <DecoratorSet idecorators, typename T>
  inline typename EnableIf<
    AccessInternal::MustConvertCompressedOop<idecorators, T>::value, T>::type
  RawAccessBarrier<decorators>::decode_internal(typename HeapOopType<idecorators>::type value) {
    if (HasDecorator<decorators, OOP_NOT_NULL>::value) {
!     return oopDesc::decode_heap_oop_not_null(value);
    } else {
!     return oopDesc::decode_heap_oop(value);
    }
  }
  
  template <DecoratorSet decorators>
  template <DecoratorSet idecorators, typename T>
  inline typename EnableIf<
    AccessInternal::MustConvertCompressedOop<idecorators, T>::value,
    typename HeapOopType<idecorators>::type>::type
  RawAccessBarrier<decorators>::encode_internal(T value) {
    if (HasDecorator<decorators, OOP_NOT_NULL>::value) {
!     return oopDesc::encode_heap_oop_not_null(value);
    } else {
!     return oopDesc::encode_heap_oop(value);
    }
  }
  
  template <DecoratorSet decorators>
  template <typename T>
--- 25,59 ----
  #ifndef SHARE_VM_RUNTIME_ACCESSBACKEND_INLINE_HPP
  #define SHARE_VM_RUNTIME_ACCESSBACKEND_INLINE_HPP
  
  #include "oops/access.hpp"
  #include "oops/accessBackend.hpp"
! #include "oops/compressedOops.inline.hpp"
! #include "oops/oopsHierarchy.hpp"
  
  template <DecoratorSet decorators>
  template <DecoratorSet idecorators, typename T>
  inline typename EnableIf<
    AccessInternal::MustConvertCompressedOop<idecorators, T>::value, T>::type
  RawAccessBarrier<decorators>::decode_internal(typename HeapOopType<idecorators>::type value) {
    if (HasDecorator<decorators, OOP_NOT_NULL>::value) {
!     return CompressedOops::decode_not_null(value);
    } else {
!     return CompressedOops::decode(value);
    }
  }
  
  template <DecoratorSet decorators>
  template <DecoratorSet idecorators, typename T>
  inline typename EnableIf<
    AccessInternal::MustConvertCompressedOop<idecorators, T>::value,
    typename HeapOopType<idecorators>::type>::type
  RawAccessBarrier<decorators>::encode_internal(T value) {
    if (HasDecorator<decorators, OOP_NOT_NULL>::value) {
!     return CompressedOops::encode_not_null(value);
    } else {
!     return CompressedOops::encode(value);
    }
  }
  
  template <DecoratorSet decorators>
  template <typename T>