stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8247388: Minimal build broken after JDK-8240245 (undefined reference to `MetaspaceShared::_use_optimized_module_handling')

Browse Source 
Reviewed-by: iklam, coleenp, dholmes
This commit is contained in:
Ao Qi 2020-06-13 18:59:44 -07:00
parent 2536cbf2cf
commit faaf52cc30
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/share/runtime/arguments.cpp
View File

@ -1467,11 +1467,13 @@ bool Arguments::add_property(const char* prop, PropertyWriteable writeable, Prop
value = &prop[key_len + 1]; value = &prop[key_len + 1];
} }
#if INCLUDE_CDS
if (is_internal_module_property(key) || if (is_internal_module_property(key) ||
strcmp(key, "jdk.module.main") == 0) { strcmp(key, "jdk.module.main") == 0) {
MetaspaceShared::disable_optimized_module_handling(); MetaspaceShared::disable_optimized_module_handling();
log_info(cds)("Using optimized module handling disabled due to incompatible property: %s=%s", key, value); log_info(cds)("Using optimized module handling disabled due to incompatible property: %s=%s", key, value);
} }
#endif
if (strcmp(key, "java.compiler") == 0) { if (strcmp(key, "java.compiler") == 0) {
process_java_compiler_argument(value); process_java_compiler_argument(value);
@ -2516,8 +2518,10 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, bool* patch_m
// -bootclasspath/a: // -bootclasspath/a:
} else if (match_option(option, "-Xbootclasspath/a:", &tail)) { } else if (match_option(option, "-Xbootclasspath/a:", &tail)) {
Arguments::append_sysclasspath(tail); Arguments::append_sysclasspath(tail);
#if INCLUDE_CDS
MetaspaceShared::disable_optimized_module_handling(); MetaspaceShared::disable_optimized_module_handling();
log_info(cds)("Using optimized module handling disabled due to bootclasspath was appended"); log_info(cds)("Using optimized module handling disabled due to bootclasspath was appended");
#endif
// -bootclasspath/p: // -bootclasspath/p:
} else if (match_option(option, "-Xbootclasspath/p:", &tail)) { } else if (match_option(option, "-Xbootclasspath/p:", &tail)) {
jio_fprintf(defaultStream::output_stream(), jio_fprintf(defaultStream::output_stream(),