8255914: [AOT] Using AOT flag should give warning when AOT is not included in build

Reviewed-by: dholmes, iveresov
This commit is contained in:
Vladimir Kozlov 2020-11-05 17:18:19 +00:00
parent a50fdd5484
commit 1b59595e1e
2 changed files with 28 additions and 0 deletions
src/hotspot/share/runtime

@ -3284,6 +3284,25 @@ jint Arguments::finalize_vm_init_args(bool patch_mod_javabase) {
}
#endif
#if !INCLUDE_AOT
UNSUPPORTED_OPTION(UseAOT);
UNSUPPORTED_OPTION(PrintAOT);
UNSUPPORTED_OPTION(UseAOTStrictLoading);
UNSUPPORTED_OPTION_NULL(AOTLibrary);
UNSUPPORTED_OPTION_INIT(Tier3AOTInvocationThreshold, 0);
UNSUPPORTED_OPTION_INIT(Tier3AOTMinInvocationThreshold, 0);
UNSUPPORTED_OPTION_INIT(Tier3AOTCompileThreshold, 0);
UNSUPPORTED_OPTION_INIT(Tier3AOTBackEdgeThreshold, 0);
UNSUPPORTED_OPTION_INIT(Tier0AOTInvocationThreshold, 0);
UNSUPPORTED_OPTION_INIT(Tier0AOTMinInvocationThreshold, 0);
UNSUPPORTED_OPTION_INIT(Tier0AOTCompileThreshold, 0);
UNSUPPORTED_OPTION_INIT(Tier0AOTBackEdgeThreshold, 0);
#ifndef PRODUCT
UNSUPPORTED_OPTION(PrintAOTStatistics);
#endif
#endif
#ifndef CAN_SHOW_REGISTERS_ON_ASSERT
UNSUPPORTED_OPTION(ShowRegistersOnAssert);
#endif // CAN_SHOW_REGISTERS_ON_ASSERT

@ -684,5 +684,14 @@ do { \
} \
} while(0)
// Initialize options not supported in this release, with a warning
// if they were explicitly requested on the command-line
#define UNSUPPORTED_OPTION_INIT(opt, value) \
do { \
if (FLAG_IS_CMDLINE(opt)) { \
warning("-XX flag " #opt " not supported in this VM"); \
} \
FLAG_SET_DEFAULT(opt, value); \
} while(0)
#endif // SHARE_RUNTIME_ARGUMENTS_HPP