src/hotspot/share/oops/resolvedFieldEntry.cpp

*** 22,12 ***
   *
   */
  
  #include "cds/archiveBuilder.hpp"
  #include "cppstdlib/type_traits.hpp"
! #include "oops/instanceKlass.hpp"
- #include "oops/instanceOop.hpp"
  #include "oops/resolvedFieldEntry.hpp"
  #include "runtime/fieldDescriptor.inline.hpp"
  #include "utilities/checkedCast.hpp"
  #include "utilities/globalDefinitions.hpp"
  
--- 22,11 ---
   *
   */
  
  #include "cds/archiveBuilder.hpp"
  #include "cppstdlib/type_traits.hpp"
! #include "interpreter/bytecodes.hpp"
  #include "oops/resolvedFieldEntry.hpp"
  #include "runtime/fieldDescriptor.inline.hpp"
  #include "utilities/checkedCast.hpp"
  #include "utilities/globalDefinitions.hpp"
  

*** 38,11 ***
    u1 _extra_field;
  };
  static_assert(sizeof(ResolvedFieldEntryWithExtra) > sizeof(ResolvedFieldEntry));
  
  void ResolvedFieldEntry::fill_in(const fieldDescriptor& info, u1 tos_state, u1 get_code, u1 put_code) {
!   set_flags(info.access_flags().is_final(), info.access_flags().is_volatile());
    _field_holder = info.field_holder();
    _field_offset = info.offset();
    _field_index = checked_cast<u2>(info.index());
    _tos_state = tos_state;
  
--- 37,15 ---
    u1 _extra_field;
  };
  static_assert(sizeof(ResolvedFieldEntryWithExtra) > sizeof(ResolvedFieldEntry));
  
  void ResolvedFieldEntry::fill_in(const fieldDescriptor& info, u1 tos_state, u1 get_code, u1 put_code) {
!   set_flags(info.access_flags().is_volatile(),
+             info.access_flags().is_final(),
+             info.is_flat(),
+             info.is_null_free_inline_type(),
+             info.has_null_marker());
    _field_holder = info.field_holder();
    _field_offset = info.offset();
    _field_index = checked_cast<u2>(info.index());
    _tos_state = tos_state;
  

*** 64,10 ***
--- 67,13 ---
    st->print_cr(" - Field Index: %d", field_index());
    st->print_cr(" - CP Index: %d", constant_pool_index());
    st->print_cr(" - TOS: %s", type2name(as_BasicType((TosState)tos_state())));
    st->print_cr(" - Is Final: %d", is_final());
    st->print_cr(" - Is Volatile: %d", is_volatile());
+   st->print_cr(" - Is Flat: %d", is_flat());
+   st->print_cr(" - Is Null Free Inline Type: %d", is_null_free_inline_type());
+   st->print_cr(" - Has null marker: %d", has_null_marker());
    st->print_cr(" - Get Bytecode: %s", Bytecodes::name((Bytecodes::Code)get_code()));
    st->print_cr(" - Put Bytecode: %s", Bytecodes::name((Bytecodes::Code)put_code()));
  }
  
  #ifdef ASSERT