Skip to content
Permalink
Browse files
8265105: gc/arguments/TestSelectDefaultGC.java fails when compiler1 i…
…s disabled

Reviewed-by: iveresov
  • Loading branch information
sunguoyun authored and Igor Veresov committed Apr 22, 2021
1 parent 657f103 commit 31d8a19e47f5b7e20d2afd55851ef64dc49d5e99
Showing with 12 additions and 8 deletions.
  1. +11 −8 src/hotspot/share/compiler/compilerDefinitions.cpp
  2. +1 −0 src/hotspot/share/compiler/compilerDefinitions.hpp
@@ -159,7 +159,8 @@ intx CompilerConfig::scaled_freq_log(intx freq_log, double scale) {
}
}

void set_client_emulation_mode_flags() {
void CompilerConfig::set_client_emulation_mode_flags() {
assert(has_c1(), "Must have C1 compiler present");
CompilationModeFlag::set_quick_only();

FLAG_SET_ERGO(ProfileInterpreter, false);
@@ -560,17 +561,19 @@ void CompilerConfig::ergo_initialize() {
return;
#endif

if (!is_compilation_mode_selected()) {
if (has_c1()) {
if (!is_compilation_mode_selected()) {
#if defined(_WINDOWS) && !defined(_LP64)
if (FLAG_IS_DEFAULT(NeverActAsServerClassMachine)) {
FLAG_SET_ERGO(NeverActAsServerClassMachine, true);
}
if (FLAG_IS_DEFAULT(NeverActAsServerClassMachine)) {
FLAG_SET_ERGO(NeverActAsServerClassMachine, true);
}
#endif
if (NeverActAsServerClassMachine) {
if (NeverActAsServerClassMachine) {
set_client_emulation_mode_flags();
}
} else if (!has_c2() && !is_jvmci_compiler()) {
set_client_emulation_mode_flags();
}
} else if (!has_c2() && !is_jvmci_compiler()) {
set_client_emulation_mode_flags();
}

set_legacy_emulation_flags();
@@ -246,6 +246,7 @@ class CompilerConfig : public AllStatic {
static void set_compilation_policy_flags();
static void set_jvmci_specific_flags();
static void set_legacy_emulation_flags();
static void set_client_emulation_mode_flags();
};

#endif // SHARE_COMPILER_COMPILERDEFINITIONS_HPP

1 comment on commit 31d8a19

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 31d8a19 Apr 22, 2021

Please sign in to comment.