From 20c80da8699d7708dee2afa94f02aa9d28d68b5a Mon Sep 17 00:00:00 2001
From: Vladimir Kozlov <vladimir.kozlov@oracle.com>
Date: Thu, 12 Jun 2025 14:57:51 -0700
Subject: [PATCH] Address comments

---
 src/hotspot/share/cds/filemap.cpp             | 21 +++----------------
 .../share/compiler/compilerDefinitions.hpp    |  2 ++
 .../compiler/compilerDefinitions.inline.hpp   | 13 ++++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/hotspot/share/cds/filemap.cpp b/src/hotspot/share/cds/filemap.cpp
index df2e48a274b..59df255fcf3 100644
--- a/src/hotspot/share/cds/filemap.cpp
+++ b/src/hotspot/share/cds/filemap.cpp
@@ -234,14 +234,7 @@ void FileMapHeader::populate(FileMapInfo *info, size_t core_region_alignment,
     _narrow_klass_pointer_bits = _narrow_klass_shift = -1;
   }
   // Which JIT compier is used
-  _compiler_type = (u1)CompilerType::compiler_none; // Interpreter only
-  if (CompilerConfig::is_c2_enabled()) {
-    _compiler_type = (u1)CompilerType::compiler_c2;
-  } else if (CompilerConfig::is_jvmci_compiler_enabled()) {
-    _compiler_type = (u1)CompilerType::compiler_jvmci;
-  } else if (CompilerConfig::is_c1_enabled()) {
-    _compiler_type = (u1)CompilerType::compiler_c1;
-  }
+  _compiler_type = (u1)CompilerConfig::compiler_type();
   _type_profile_level = TypeProfileLevel;
   _type_profile_args_limit = TypeProfileArgsLimit;
   _type_profile_parms_limit = TypeProfileParmsLimit;
@@ -1946,17 +1939,9 @@ bool FileMapHeader::validate() {
     return false;
   }
   bool jvmci_compiler_is_enabled = CompilerConfig::is_jvmci_compiler_enabled();
-  CompilerType compiler_type = CompilerType::compiler_none; // Interpreter only
-  if (CompilerConfig::is_c2_enabled()) {
-    compiler_type = CompilerType::compiler_c2;
-  } else if (jvmci_compiler_is_enabled) {
-    compiler_type = CompilerType::compiler_jvmci;
-  } else if (CompilerConfig::is_c1_enabled()) {
-    compiler_type = CompilerType::compiler_c1;
-  }
+  CompilerType compiler_type = CompilerConfig::compiler_type();
   CompilerType archive_compiler_type = CompilerType(_compiler_type);
-  // JVMCI compiler loads additional jdk.internal.vm.ci module,
-  // does different type profiling settigns and generate
+  // JVMCI compiler does different type profiling settigns and generate
   // different code. We can't use archive which was produced
   // without it and reverse.
   // Only allow mix when JIT compilation is disabled.
diff --git a/src/hotspot/share/compiler/compilerDefinitions.hpp b/src/hotspot/share/compiler/compilerDefinitions.hpp
index bacc1f73f97..1c8c65b2a53 100644
--- a/src/hotspot/share/compiler/compilerDefinitions.hpp
+++ b/src/hotspot/share/compiler/compilerDefinitions.hpp
@@ -149,6 +149,8 @@ public:
   inline static bool is_c2_or_jvmci_compiler_only();
   inline static bool is_c2_or_jvmci_compiler_enabled();
 
+  inline static CompilerType compiler_type();
+
 private:
   static bool is_compilation_mode_selected();
   static void set_compilation_policy_flags();
diff --git a/src/hotspot/share/compiler/compilerDefinitions.inline.hpp b/src/hotspot/share/compiler/compilerDefinitions.inline.hpp
index fe17b77535f..21bf80549f4 100644
--- a/src/hotspot/share/compiler/compilerDefinitions.inline.hpp
+++ b/src/hotspot/share/compiler/compilerDefinitions.inline.hpp
@@ -131,4 +131,17 @@ inline bool CompilerConfig::is_c2_or_jvmci_compiler_enabled() {
   return is_c2_enabled() || is_jvmci_compiler_enabled();
 }
 
+// Return type of most optimizing compiler which is used
+inline CompilerType CompilerConfig::compiler_type() {
+  CompilerType compiler_type = CompilerType::compiler_none; // Interpreter only
+  if (CompilerConfig::is_c2_enabled()) {
+    compiler_type = CompilerType::compiler_c2;
+  } else if (CompilerConfig::is_jvmci_compiler_enabled()) {
+    compiler_type = CompilerType::compiler_jvmci;
+  } else if (CompilerConfig::is_c1_enabled()) {
+    compiler_type = CompilerType::compiler_c1;
+  }
+  return compiler_type;
+}
+
 #endif // SHARE_COMPILER_COMPILERDEFINITIONS_INLINE_HPP