1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8173119: compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java fails with custom Tiered Level set externally

Browse Source 
Check for invalid JVMCI flag combination at startup.

Reviewed-by: kvn, thartmann
This commit is contained in:
Oleg Pliss 2017-02-06 08:32:08 +01:00 committed by Tobias Hartmann
parent 6f2cad0c0c
commit a7f34a3295
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hotspot/src/share/vm/runtime/arguments.cpp
View File

@ -1894,6 +1894,11 @@ void Arguments::set_jvmci_specific_flags() {
if (FLAG_IS_DEFAULT(NewSizeThreadIncrease)) { if (FLAG_IS_DEFAULT(NewSizeThreadIncrease)) {
FLAG_SET_DEFAULT(NewSizeThreadIncrease, 4*K); FLAG_SET_DEFAULT(NewSizeThreadIncrease, 4*K);
} }
if (TieredStopAtLevel != CompLevel_full_optimization) {
// Currently JVMCI compiler can only work at the full optimization level
warning("forcing TieredStopAtLevel to full optimization because JVMCI is enabled");
TieredStopAtLevel = CompLevel_full_optimization;
}
if (FLAG_IS_DEFAULT(TypeProfileLevel)) { if (FLAG_IS_DEFAULT(TypeProfileLevel)) {
FLAG_SET_DEFAULT(TypeProfileLevel, 0); FLAG_SET_DEFAULT(TypeProfileLevel, 0);
} }
@ -2506,8 +2511,8 @@ bool Arguments::check_vm_args_consistency() {
} }
#endif #endif
} }
#if INCLUDE_JVMCI
#if INCLUDE_JVMCI
status = status && check_jvmci_args_consistency(); status = status && check_jvmci_args_consistency();
if (EnableJVMCI) { if (EnableJVMCI) {