src/hotspot/share/runtime/arguments.hpp

*** 88,10 ***
--- 88,11 ---
    ModulePatchPath(const char* module_name, const char* path);
    ~ModulePatchPath();
  
    inline const char* module_name() const { return _module_name; }
    inline char* path_string() const { return _path->value(); }
+   inline void append_path(const char* path) { _path->append_value(path); }
  };
  
  // Element describing System and User (-Dkey=value flags) defined property.
  //
  // An internal SystemProperty is one that has been removed in

*** 475,11 ***
    static void set_java_home(const char *value) { _java_home->set_value(value); }
    static void set_library_path(const char *value) { _java_library_path->set_value(value); }
    static void set_ext_dirs(char *value);
  
    // Set up the underlying pieces of the boot class path
!   static void add_patch_mod_prefix(const char *module_name, const char *path);
    static void set_boot_class_path(const char *value, bool has_jimage) {
      // During start up, set by os::set_boot_path()
      assert(get_boot_class_path() == nullptr, "Boot class path previously set");
      _boot_class_path->set_value(value);
      _has_jimage = has_jimage;
--- 476,13 ---
    static void set_java_home(const char *value) { _java_home->set_value(value); }
    static void set_library_path(const char *value) { _java_library_path->set_value(value); }
    static void set_ext_dirs(char *value);
  
    // Set up the underlying pieces of the boot class path
!   static void add_patch_mod_prefix(const char *module_name, const char *path, bool allow_append, bool allow_cds);
+   static int finalize_patch_module();
+ 
    static void set_boot_class_path(const char *value, bool has_jimage) {
      // During start up, set by os::set_boot_path()
      assert(get_boot_class_path() == nullptr, "Boot class path previously set");
      _boot_class_path->set_value(value);
      _has_jimage = has_jimage;

*** 506,10 ***
--- 509,14 ---
  
  
    // preview features
    static void set_enable_preview() { _enable_preview = true; }
    static bool enable_preview() { return _enable_preview; }
+   static bool is_valhalla_enabled() {
+     // Valhalla is a feature opted-in by --enable-preview
+     return enable_preview();
+   }
  
    // jdwp
    static bool has_jdwp_agent() { return _has_jdwp_agent; }
  
    // Utility: copies src into buf, replacing "%%" with "%" and "%p" with pid.