src/hotspot/share/cds/cdsConfig.hpp

*** 44,10 ***
--- 44,13 ---
    static bool _has_aot_linked_classes;
    static bool _is_single_command_training;
    static bool _has_temp_aot_config_file;
    static bool _is_at_aot_safepoint;
  
+   static bool _module_patching_disables_cds;
+   static bool _java_base_module_patching_disables_cds;
+ 
    const static char* _default_archive_path;
    const static char* _input_static_archive_path;
    const static char* _input_dynamic_archive_path;
    const static char* _output_archive_path;
  

*** 95,11 ***
    static bool old_cds_flags_used()                           { return CDS_ONLY(_old_cds_flags_used) NOT_CDS(false); }
    static bool new_aot_flags_used()                           { return CDS_ONLY(_new_aot_flags_used) NOT_CDS(false); }
    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 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 const char* type_of_archive_being_loaded();
    static const char* type_of_archive_being_written();
    static void prepare_for_dumping();
  
    static bool is_at_aot_safepoint()                          { return CDS_ONLY(_is_at_aot_safepoint) NOT_CDS(false); }
--- 98,16 ---
    static bool old_cds_flags_used()                           { return CDS_ONLY(_old_cds_flags_used) NOT_CDS(false); }
    static bool new_aot_flags_used()                           { return CDS_ONLY(_new_aot_flags_used) NOT_CDS(false); }
    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 bool has_unsupported_runtime_module_options() NOT_CDS_RETURN_(false);
!   static bool check_vm_args_consistency(bool mode_flag_cmd_line) NOT_CDS_RETURN_(true);
+ 
+   static bool module_patching_disables_cds() { return CDS_ONLY(_module_patching_disables_cds) NOT_CDS(false); }
+   static void set_module_patching_disables_cds() { CDS_ONLY(_module_patching_disables_cds = true;) }
+   static bool java_base_module_patching_disables_cds() { return CDS_ONLY(_java_base_module_patching_disables_cds) NOT_CDS(false); }
+   static void set_java_base_module_patching_disables_cds() { CDS_ONLY(_java_base_module_patching_disables_cds = true;) }
    static const char* type_of_archive_being_loaded();
    static const char* type_of_archive_being_written();
    static void prepare_for_dumping();
  
    static bool is_at_aot_safepoint()                          { return CDS_ONLY(_is_at_aot_safepoint) NOT_CDS(false); }