src/hotspot/share/memory/filemap.hpp

*** 151,171 ****
    char  _jvm_ident[JVM_IDENT_MAX];      // identifier for jvm
  
    // size of the base archive name including NULL terminator
    int _base_archive_name_size;
  
!   // The following is a table of all the class path entries that were used
!   // during dumping. At run time, we require these files to exist and have the same
!   // size/modification time, or else the archive will refuse to load.
!   //
!   // All of these entries must be JAR files. The dumping process would fail if a non-empty
!   // directory was specified in the classpaths. If an empty directory was specified
!   // it is checked by the _paths_misc_info as described above.
!   //
!   // FIXME -- if JAR files in the tail of the list were specified but not used during dumping,
!   // they should be removed from this table, to save space and to avoid spurious
!   // loading failures during runtime.
    SharedPathTable _shared_path_table;
  
    jshort _app_class_paths_start_index;  // Index of first app classpath entry
    jshort _app_module_paths_start_index; // Index of first module path entry
    jshort _num_module_paths;             // number of module path entries
--- 151,166 ----
    char  _jvm_ident[JVM_IDENT_MAX];      // identifier for jvm
  
    // size of the base archive name including NULL terminator
    int _base_archive_name_size;
  
!   // The following is a table of all the boot/app/module path entries that were used
!   // during dumping. At run time, we we validate these entries according to their
!   // SharedClassPathEntry::_type. See:
!   //      check_nonempty_dir_in_shared_path_table()
!   //      validate_shared_path_table()
!   //      validate_non_existent_class_paths()
    SharedPathTable _shared_path_table;
  
    jshort _app_class_paths_start_index;  // Index of first app classpath entry
    jshort _app_module_paths_start_index; // Index of first module path entry
    jshort _num_module_paths;             // number of module path entries
*** 223,233 ****
  
  
    FileMapHeader * _header;
  
    const char* _full_path;
-   char* _paths_misc_info;
    char* _base_archive_name;
  
    static FileMapInfo* _current_info;
    static FileMapInfo* _dynamic_archive_info;
    static bool _heap_pointers_need_patching;
--- 218,227 ----
*** 351,361 ****
  
    static void allocate_shared_path_table();
    static int add_shared_classpaths(int i, const char* which, ClassPathEntry *cpe, TRAPS);
    static void check_nonempty_dir_in_shared_path_table();
    bool validate_shared_path_table();
!   bool validate_non_existent_class_paths() const;
    static void update_jar_manifest(ClassPathEntry *cpe, SharedClassPathEntry* ent, TRAPS);
    static int num_non_existent_class_paths();
    static void record_non_existent_class_path_entry(const char* path);
  
  #if INCLUDE_JVMTI
--- 345,355 ----
  
    static void allocate_shared_path_table();
    static int add_shared_classpaths(int i, const char* which, ClassPathEntry *cpe, TRAPS);
    static void check_nonempty_dir_in_shared_path_table();
    bool validate_shared_path_table();
!   void validate_non_existent_class_paths();
    static void update_jar_manifest(ClassPathEntry *cpe, SharedClassPathEntry* ent, TRAPS);
    static int num_non_existent_class_paths();
    static void record_non_existent_class_path_entry(const char* path);
  
  #if INCLUDE_JVMTI