src/hotspot/share/cds/filemap.hpp

@@ -185,15 +185,18 @@
    size_t _core_region_alignment;                  // how shared archive should be aligned
    int    _obj_alignment;                          // value of ObjectAlignmentInBytes
    address _narrow_oop_base;                       // compressed oop encoding base
    int    _narrow_oop_shift;                       // compressed oop encoding shift
    bool   _compact_strings;                        // value of CompactStrings
+   bool   _compact_headers;                        // value of UseCompactObjectHeaders
    uintx  _max_heap_size;                          // java max heap size during dumping
    CompressedOops::Mode _narrow_oop_mode;          // compressed oop encoding mode
    bool    _compressed_oops;                       // save the flag UseCompressedOops
    bool    _compressed_class_ptrs;                 // save the flag UseCompressedClassPointers
    bool    _use_secondary_supers_table;            // save the flag UseSecondarySupersTable
+   int     _narrow_klass_pointer_bits;             // save number of bits in narrowKlass
+   int     _narrow_klass_shift;                    // save shift width used to pre-compute narrowKlass IDs in archived heap objects
    size_t  _cloned_vtables_offset;                 // The address of the first cloned vtable
    size_t  _serialized_data_offset;                // Data accessed using {ReadClosure,WriteClosure}::serialize()
    bool _has_non_jar_in_classpath;                 // non-jar file entry exists in classpath
    unsigned int _common_app_classpath_prefix_size; // size of the common prefix of app class paths
                                                    //    0 if no common prefix exists

@@ -257,10 +260,11 @@
    size_t core_region_alignment()           const { return _core_region_alignment; }
    int obj_alignment()                      const { return _obj_alignment; }
    address narrow_oop_base()                const { return _narrow_oop_base; }
    int narrow_oop_shift()                   const { return _narrow_oop_shift; }
    bool compact_strings()                   const { return _compact_strings; }
+   bool compact_headers()                   const { return _compact_headers; }
    uintx max_heap_size()                    const { return _max_heap_size; }
    CompressedOops::Mode narrow_oop_mode()   const { return _narrow_oop_mode; }
    char* cloned_vtables()                   const { return from_mapped_offset(_cloned_vtables_offset); }
    char* serialized_data()                  const { return from_mapped_offset(_serialized_data_offset); }
    const char* jvm_ident()                  const { return _jvm_ident; }

@@ -268,10 +272,12 @@
    char* mapped_base_address()              const { return _mapped_base_address; }
    bool has_platform_or_app_classes()       const { return _has_platform_or_app_classes; }
    bool has_non_jar_in_classpath()          const { return _has_non_jar_in_classpath; }
    bool compressed_oops()                   const { return _compressed_oops; }
    bool compressed_class_pointers()         const { return _compressed_class_ptrs; }
+   int narrow_klass_pointer_bits()          const { return _narrow_klass_pointer_bits; }
+   int narrow_klass_shift()                 const { return _narrow_klass_shift; }
    size_t heap_roots_offset()               const { return _heap_roots_offset; }
    size_t heap_oopmap_start_pos()           const { return _heap_oopmap_start_pos; }
    size_t heap_ptrmap_start_pos()           const { return _heap_ptrmap_start_pos; }
    size_t rw_ptrmap_start_pos()             const { return _rw_ptrmap_start_pos; }
    size_t ro_ptrmap_start_pos()             const { return _ro_ptrmap_start_pos; }