*** old/src/hotspot/share/classfile/sharedClassUtil.cpp	Mon Apr  2 14:11:41 2018
--- new/src/hotspot/share/classfile/sharedClassUtil.cpp	Mon Apr  2 14:11:40 2018

*** 91,100 ****
--- 91,103 ----
  void SharedPathsMiscInfoExt::print_path(outputStream* out, int type, const char* path) {
    switch(type) {
    case APP:
      ClassLoader::trace_class_path("Expecting -Djava.class.path=", path);
      break;
+   case MODULE:
+     ClassLoader::trace_class_path("Checking module path: ", path);
+     break;
    default:
      SharedPathsMiscInfo::print_path(out, type, path);
    }
  }
  

*** 165,180 ****
--- 168,184 ----
    }
  }
  
  void SharedClassUtil::initialize(TRAPS) {
    if (UseSharedSpaces) {
!     int size = FileMapInfo::get_number_of_share_classpaths();
!     int size = FileMapInfo::get_number_of_shared_paths();
      if (size > 0) {
        SystemDictionaryShared::allocate_shared_data_arrays(size, THREAD);
        if (!DumpSharedSpaces) {
          FileMapHeaderExt* header = (FileMapHeaderExt*)FileMapInfo::current_info()->header();
!         ClassLoaderExt::init_paths_start_index(header->_app_paths_start_index);
!         ClassLoaderExt::init_paths_start_index(header->_app_class_paths_start_index);
+         ClassLoaderExt::init_app_module_paths_start_index(header->_app_module_paths_start_index);
        }
      }
    }
  
    if (DumpSharedSpaces) {

*** 206,224 ****
--- 210,229 ----
  }
  
  bool SharedClassUtil::is_classpath_entry_signed(int classpath_index) {
    assert(classpath_index >= 0, "Sanity");
    SharedClassPathEntryExt* ent = (SharedClassPathEntryExt*)
!     FileMapInfo::shared_classpath(classpath_index);
!     FileMapInfo::shared_path(classpath_index);
    return ent->_is_signed;
  }
  
  void FileMapHeaderExt::populate(FileMapInfo* mapinfo, size_t alignment) {
    FileMapInfo::FileMapHeader::populate(mapinfo, alignment);
  
    ClassLoaderExt::finalize_shared_paths_misc_info();
!   _app_paths_start_index = ClassLoaderExt::app_paths_start_index();
!   _app_class_paths_start_index = ClassLoaderExt::app_class_paths_start_index();
+   _app_module_paths_start_index = ClassLoaderExt::app_module_paths_start_index();
  
    _verify_local = BytecodeVerificationLocal;
    _verify_remote = BytecodeVerificationRemote;
    _has_platform_or_app_classes = ClassLoaderExt::has_platform_or_app_classes();
  }