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

*** 61,15 ***
    } else {
      return nullptr;
    }
  }
  
! inline ObjArrayKlass* InstanceKlass::array_klasses_acquire() const {
    return Atomic::load_acquire(&_array_klasses);
  }
  
! inline void InstanceKlass::release_set_array_klasses(ObjArrayKlass* k) {
    Atomic::release_store(&_array_klasses, k);
  }
  
  inline jmethodID* InstanceKlass::methods_jmethod_ids_acquire() const {
    return Atomic::load_acquire(&_methods_jmethod_ids);
--- 61,60 ---
    } else {
      return nullptr;
    }
  }
  
! inline address InstanceKlass::adr_inline_type_field_klasses() const {
+   if (has_inline_type_fields()) {
+     InstanceKlass* volatile* adr_impl = adr_implementor();
+     if (adr_impl != nullptr) {
+       return (address)(adr_impl + 1);
+     }
+ 
+     return (address)end_of_nonstatic_oop_maps();
+   } else {
+     return nullptr;
+   }
+ }
+ 
+ inline Klass* InstanceKlass::get_inline_type_field_klass(int idx) const {
+   assert(has_inline_type_fields(), "Sanity checking");
+   assert(idx < java_fields_count(), "IOOB");
+   Klass* k = ((Klass**)adr_inline_type_field_klasses())[idx];
+   assert(k != nullptr, "Should always be set before being read");
+   assert(k->is_inline_klass(), "Must be an inline type");
+   return k;
+ }
+ 
+ inline Klass* InstanceKlass::get_inline_type_field_klass_or_null(int idx) const {
+   assert(has_inline_type_fields(), "Sanity checking");
+   assert(idx < java_fields_count(), "IOOB");
+   Klass* k = ((Klass**)adr_inline_type_field_klasses())[idx];
+   assert(k == nullptr || k->is_inline_klass(), "Must be an inline type");
+   return k;
+ }
+ 
+ inline void InstanceKlass::set_inline_type_field_klass(int idx, Klass* k) {
+   assert(has_inline_type_fields(), "Sanity checking");
+   assert(idx < java_fields_count(), "IOOB");
+   assert(k != nullptr, "Should not be set to nullptr");
+   assert(((Klass**)adr_inline_type_field_klasses())[idx] == nullptr, "Should not be set twice");
+   ((Klass**)adr_inline_type_field_klasses())[idx] = k;
+ }
+ 
+ inline void InstanceKlass::reset_inline_type_field_klass(int idx) {
+   assert(has_inline_type_fields(), "Sanity checking");
+   assert(idx < java_fields_count(), "IOOB");
+   ((Klass**)adr_inline_type_field_klasses())[idx] = nullptr;
+ }
+ 
+ 
+ inline ArrayKlass* InstanceKlass::array_klasses_acquire() const {
    return Atomic::load_acquire(&_array_klasses);
  }
  
! inline void InstanceKlass::release_set_array_klasses(ArrayKlass* k) {
    Atomic::release_store(&_array_klasses, k);
  }
  
  inline jmethodID* InstanceKlass::methods_jmethod_ids_acquire() const {
    return Atomic::load_acquire(&_methods_jmethod_ids);