src/hotspot/share/cds/cdsConfig.hpp

@@ -35,10 +35,13 @@
    static bool _is_dumping_dynamic_archive;
    static bool _is_using_optimized_module_handling;
    static bool _is_dumping_full_module_graph;
    static bool _is_using_full_module_graph;
  
+   static bool _module_patching_disables_cds;
+   static bool _java_base_module_patching_disables_cds;
+ 
    static char* _default_archive_path;
    static char* _static_archive_path;
    static char* _dynamic_archive_path;
  #endif
  

@@ -59,11 +62,16 @@
    static void initialize() NOT_CDS_RETURN;
    static void check_internal_module_property(const char* key, const char* value) NOT_CDS_RETURN;
    static void check_incompatible_property(const char* key, const char* value) NOT_CDS_RETURN;
    static void check_unsupported_dumping_module_options() NOT_CDS_RETURN;
    static bool has_unsupported_runtime_module_options() NOT_CDS_RETURN_(false);
-   static bool check_vm_args_consistency(bool patch_mod_javabase, bool mode_flag_cmd_line) NOT_CDS_RETURN_(true);
+   static bool check_vm_args_consistency(bool mode_flag_cmd_line) NOT_CDS_RETURN_(true);
+ 
+   static bool module_patching_disables_cds() { return _module_patching_disables_cds; }
+   static void set_module_patching_disables_cds() { _module_patching_disables_cds = true; }
+   static bool java_base_module_patching_disables_cds() { return _java_base_module_patching_disables_cds; }
+   static void set_java_base_module_patching_disables_cds() { _java_base_module_patching_disables_cds = true; }
  
    // --- Basic CDS features
  
    // archive(s) in general
    static bool is_dumping_archive()                           { return is_dumping_static_archive() || is_dumping_dynamic_archive(); }

@@ -101,8 +109,11 @@
    // full_module_graph (requires optimized_module_handling)
    static bool is_dumping_full_module_graph()                 { return CDS_ONLY(_is_dumping_full_module_graph) NOT_CDS(false); }
    static bool is_using_full_module_graph()                   NOT_CDS_JAVA_HEAP_RETURN_(false);
    static void stop_dumping_full_module_graph(const char* reason = nullptr) NOT_CDS_JAVA_HEAP_RETURN;
    static void stop_using_full_module_graph(const char* reason = nullptr) NOT_CDS_JAVA_HEAP_RETURN;
+ 
+   static bool is_valhalla_preview();
+ 
  };
  
  #endif // SHARE_CDS_CDSCONFIG_HPP