8373599: Cleanup arguments.hpp includes

Reviewed-by: coleenp, kbarrett

Author: stefank

src/hotspot/share/compiler/compilerDefinitions.inline.hpp

@@ -29,6 +29,7 @@
 
 #include "compiler/compiler_globals.hpp"
 #include "runtime/arguments.hpp"
+#include "runtime/globals.hpp"
 
 inline bool CompilerConfig::is_interpreter_only() {
   return Arguments::is_interpreter_only() || TieredStopAtLevel == CompLevel_none;

src/hotspot/share/runtime/abstract_vm_version.cpp

@@ -26,6 +26,7 @@
 #include "compiler/compilerDefinitions.hpp"
 #include "jvm_io.h"
 #include "runtime/arguments.hpp"
+#include "runtime/os.hpp"
 #include "runtime/vm_version.hpp"
 #include "utilities/globalDefinitions.hpp"
 

src/hotspot/share/runtime/arguments.cpp

@@ -1092,6 +1092,13 @@ void Arguments::print_summary_on(outputStream* st) {
   st->cr();
 }
 
+void Arguments::set_jvm_flags_file(const char *value) {
+  if (_jvm_flags_file != nullptr) {
+    os::free(_jvm_flags_file);
+  }
+  _jvm_flags_file = os::strdup_check_oom(value);
+}
+
 void Arguments::print_jvm_flags_on(outputStream* st) {
   if (_num_jvm_flags > 0) {
     for (int i=0; i < _num_jvm_flags; i++) {
@@ -2844,6 +2851,10 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, JVMFlagOrigin
   return JNI_OK;
 }
 
+void Arguments::set_ext_dirs(char *value) {
+  _ext_dirs = os::strdup_check_oom(value);
+}
+
 void Arguments::add_patch_mod_prefix(const char* module_name, const char* path) {
   // For java.base check for duplicate --patch-module options being specified on the command line.
   // This check is only required for java.base, all other duplicate module specifications

src/hotspot/share/runtime/arguments.hpp

@@ -25,18 +25,17 @@
 #ifndef SHARE_RUNTIME_ARGUMENTS_HPP
 #define SHARE_RUNTIME_ARGUMENTS_HPP
 
-#include "logging/logLevel.hpp"
-#include "logging/logTag.hpp"
+#include "jni.h"
 #include "memory/allocation.hpp"
 #include "memory/allStatic.hpp"
-#include "runtime/globals.hpp"
+#include "runtime/flags/jvmFlag.hpp"
 #include "runtime/java.hpp"
-#include "runtime/os.hpp"
-#include "utilities/debug.hpp"
-#include "utilities/vmEnums.hpp"
+#include "utilities/globalDefinitions.hpp"
 
 // Arguments parses the command line and recognizes options
 
+template <typename E>
+class GrowableArray;
 class JVMFlag;
 
 // Invocation API hook typedefs (these should really be defined in jni.h)
@@ -412,12 +411,8 @@ class Arguments : AllStatic {
 
   // convenient methods to get and set jvm_flags_file
   static const char* get_jvm_flags_file()  { return _jvm_flags_file; }
-  static void set_jvm_flags_file(const char *value) {
-    if (_jvm_flags_file != nullptr) {
-      os::free(_jvm_flags_file);
-    }
-    _jvm_flags_file = os::strdup_check_oom(value);
-  }
+  static void set_jvm_flags_file(const char *value);
+
   // convenient methods to obtain / print jvm_flags and jvm_args
   static const char* jvm_flags()           { return build_resource_string(_jvm_flags_array, _num_jvm_flags); }
   static const char* jvm_args()            { return build_resource_string(_jvm_args_array, _num_jvm_args); }
@@ -479,7 +474,7 @@ class Arguments : AllStatic {
   static void set_dll_dir(const char *value) { _sun_boot_library_path->set_value(value); }
   static void set_java_home(const char *value) { _java_home->set_value(value); }
   static void set_library_path(const char *value) { _java_library_path->set_value(value); }
-  static void set_ext_dirs(char *value)     { _ext_dirs = os::strdup_check_oom(value); }
+  static void set_ext_dirs(char *value);
 
   // Set up the underlying pieces of the boot class path
   static void add_patch_mod_prefix(const char *module_name, const char *path);

src/hotspot/share/runtime/java.cpp

@@ -71,6 +71,7 @@
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/java.hpp"
 #include "runtime/javaThread.hpp"
+#include "runtime/os.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/stubRoutines.hpp"
 #include "runtime/task.hpp"
@@ -765,3 +766,23 @@ void JDK_Version::to_string(char* buffer, size_t buflen) const {
     }
   }
 }
+
+void JDK_Version::set_java_version(const char* version) {
+  _java_version = os::strdup(version);
+}
+
+void JDK_Version::set_runtime_name(const char* name) {
+  _runtime_name = os::strdup(name);
+}
+
+void JDK_Version::set_runtime_version(const char* version) {
+  _runtime_version = os::strdup(version);
+}
+
+void JDK_Version::set_runtime_vendor_version(const char* vendor_version) {
+  _runtime_vendor_version = os::strdup(vendor_version);
+}
+
+void JDK_Version::set_runtime_vendor_vm_bug_url(const char* vendor_vm_bug_url) {
+  _runtime_vendor_vm_bug_url = os::strdup(vendor_vm_bug_url);
+}

src/hotspot/share/runtime/java.hpp

@@ -25,7 +25,6 @@
 #ifndef SHARE_RUNTIME_JAVA_HPP
 #define SHARE_RUNTIME_JAVA_HPP
 
-#include "runtime/os.hpp"
 #include "utilities/globalDefinitions.hpp"
 
 class Handle;
@@ -133,38 +132,27 @@ class JDK_Version {
   static const char* java_version() {
     return _java_version;
   }
-  static void set_java_version(const char* version) {
-    _java_version = os::strdup(version);
-  }
+  static void set_java_version(const char* version);
 
   static const char* runtime_name() {
     return _runtime_name;
   }
-  static void set_runtime_name(const char* name) {
-    _runtime_name = os::strdup(name);
-  }
+  static void set_runtime_name(const char* name);
 
   static const char* runtime_version() {
     return _runtime_version;
   }
-  static void set_runtime_version(const char* version) {
-    _runtime_version = os::strdup(version);
-  }
+  static void set_runtime_version(const char* version);
 
   static const char* runtime_vendor_version() {
     return _runtime_vendor_version;
   }
-  static void set_runtime_vendor_version(const char* vendor_version) {
-    _runtime_vendor_version = os::strdup(vendor_version);
-  }
+  static void set_runtime_vendor_version(const char* vendor_version);
 
   static const char* runtime_vendor_vm_bug_url() {
     return _runtime_vendor_vm_bug_url;
   }
-  static void set_runtime_vendor_vm_bug_url(const char* vendor_vm_bug_url) {
-    _runtime_vendor_vm_bug_url = os::strdup(vendor_vm_bug_url);
-  }
-
+  static void set_runtime_vendor_vm_bug_url(const char* vendor_vm_bug_url);
 };
 
 #endif // SHARE_RUNTIME_JAVA_HPP

test/hotspot/gtest/runtime/test_arguments.cpp

@@ -24,6 +24,7 @@
 #include "jvm.h"
 #include "runtime/arguments.hpp"
 #include "runtime/flags/jvmFlag.hpp"
+#include "runtime/os.hpp"
 #include "utilities/align.hpp"
 #include "utilities/globalDefinitions.hpp"