*** old/src/share/vm/classfile/classLoader.hpp	Wed Sep 14 11:20:34 2016
--- new/src/share/vm/classfile/classLoader.hpp	Wed Sep 14 11:20:34 2016

*** 67,76 ****
--- 67,77 ----
    // Constructor
    ClassPathEntry() : _next(NULL) {}
    // Attempt to locate file_name through this class path entry.
    // Returns a class file parsing stream if successfull.
    virtual ClassFileStream* open_stream(const char* name, TRAPS) = 0;
+   virtual bool stream_exists(const char* name) = 0;
    // Debugging
    NOT_PRODUCT(virtual void compile_the_world(Handle loader, TRAPS) = 0;)
  };
  
  class ClassPathDirEntry: public ClassPathEntry {

*** 81,90 ****
--- 82,92 ----
    bool is_jar_file() const { return false;  }
    const char* name() const { return _dir; }
    JImageFile* jimage() const { return NULL; }
    ClassPathDirEntry(const char* dir);
    ClassFileStream* open_stream(const char* name, TRAPS);
+   bool stream_exists(const char* name) { return false; }
    // Debugging
    NOT_PRODUCT(void compile_the_world(Handle loader, TRAPS);)
  };
  
  

*** 124,133 ****
--- 126,136 ----
    u1* open_entry(const char* name, jint* filesize, bool nul_terminate, TRAPS);
    u1* open_versioned_entry(const char* name, jint* filesize, TRAPS) NOT_CDS_RETURN_(NULL);
    ClassFileStream* open_stream(const char* name, TRAPS);
    void contents_do(void f(const char* name, void* context), void* context);
    bool is_multiple_versioned(TRAPS) NOT_CDS_RETURN_(false);
+   bool stream_exists(const char* name);
    // Debugging
    NOT_PRODUCT(void compile_the_world(Handle loader, TRAPS);)
  };
  
  

*** 143,152 ****
--- 146,156 ----
    const char* name() const { return _name == NULL ? "" : _name; }
    JImageFile* jimage() const { return _jimage; }
    ClassPathImageEntry(JImageFile* jimage, const char* name);
    ~ClassPathImageEntry();
    ClassFileStream* open_stream(const char* name, TRAPS);
+   bool stream_exists(const char* name) { return false; }
  
    // Debugging
    NOT_PRODUCT(void compile_the_world(Handle loader, TRAPS);)
  };
  

*** 253,262 ****
--- 257,267 ----
    // Array of module names associated with the platform class loader
    CDS_ONLY(static GrowableArray<char*>* _platform_modules_array;)
  
    // Info used by CDS
    CDS_ONLY(static SharedPathsMiscInfo * _shared_paths_misc_info;)
+   CDS_ONLY(static int _num_patch_mod_prefixes;)
  
    // Initialization:
    //   - setup the boot loader's system class path
    //   - setup the boot loader's patch mod entries, if present
    //   - create the ModuleEntry for java.base

*** 425,434 ****
--- 430,442 ----
  
    static s2 module_to_classloader(const char* module_name);
    static void initialize_module_loader_map(JImageFile* jimage);
    static s2 classloader_type(Symbol* class_name, ClassPathEntry* e,
                               int classpath_index, TRAPS);
+   static bool is_in_patch_module(const char* const file_name);
+   static void setup_patch_mod_path(); // Only when -Xshare:dump
+   static int num_patch_mod_prefixes() { return _num_patch_mod_prefixes; }
  #endif
  
    static void  trace_class_path(const char* msg, const char* name = NULL);
  
    // VM monitoring and management support