8213760: os::obsolete_option is obsolete and should be removed
Reviewed-by: jiangli, igerasim, stuefe
--- a/src/hotspot/os/aix/os_aix.inline.hpp Tue Nov 13 13:42:39 2018 -0800
+++ b/src/hotspot/os/aix/os_aix.inline.hpp Tue Nov 13 16:49:58 2018 -0500
@@ -41,10 +41,6 @@
return strncmp(s1, s2, num);
}
-inline bool os::obsolete_option(const JavaVMOption *option) {
- return false;
-}
-
inline bool os::uses_stack_guard_pages() {
return true;
}
--- a/src/hotspot/os/bsd/os_bsd.inline.hpp Tue Nov 13 13:42:39 2018 -0800
+++ b/src/hotspot/os/bsd/os_bsd.inline.hpp Tue Nov 13 16:49:58 2018 -0500
@@ -39,10 +39,6 @@
return strncmp(s1, s2, num);
}
-inline bool os::obsolete_option(const JavaVMOption *option) {
- return false;
-}
-
inline bool os::uses_stack_guard_pages() {
return true;
}
--- a/src/hotspot/os/linux/os_linux.inline.hpp Tue Nov 13 13:42:39 2018 -0800
+++ b/src/hotspot/os/linux/os_linux.inline.hpp Tue Nov 13 16:49:58 2018 -0500
@@ -39,10 +39,6 @@
return strncmp(s1, s2, num);
}
-inline bool os::obsolete_option(const JavaVMOption *option) {
- return false;
-}
-
inline bool os::uses_stack_guard_pages() {
return true;
}
--- a/src/hotspot/os/solaris/os_solaris.cpp Tue Nov 13 13:42:39 2018 -0800
+++ b/src/hotspot/os/solaris/os_solaris.cpp Tue Nov 13 16:49:58 2018 -0500
@@ -700,19 +700,6 @@
BREAKPOINT;
}
-bool os::obsolete_option(const JavaVMOption *option) {
- if (!strncmp(option->optionString, "-Xt", 3)) {
- return true;
- } else if (!strncmp(option->optionString, "-Xtm", 4)) {
- return true;
- } else if (!strncmp(option->optionString, "-Xverifyheap", 12)) {
- return true;
- } else if (!strncmp(option->optionString, "-Xmaxjitcodesize", 16)) {
- return true;
- }
- return false;
-}
-
bool os::Solaris::valid_stack_address(Thread* thread, address sp) {
address stackStart = (address)thread->stack_base();
address stackEnd = (address)(stackStart - (address)thread->stack_size());
--- a/src/hotspot/os/windows/os_windows.inline.hpp Tue Nov 13 13:42:39 2018 -0800
+++ b/src/hotspot/os/windows/os_windows.inline.hpp Tue Nov 13 16:49:58 2018 -0500
@@ -45,10 +45,6 @@
return (void*)::GetProcAddress((HMODULE)lib, name);
}
-inline bool os::obsolete_option(const JavaVMOption *option) {
- return false;
-}
-
inline bool os::uses_stack_guard_pages() {
return true;
}
--- a/src/hotspot/share/runtime/arguments.cpp Tue Nov 13 13:42:39 2018 -0800
+++ b/src/hotspot/share/runtime/arguments.cpp Tue Nov 13 16:49:58 2018 -0500
@@ -2074,17 +2074,10 @@
option_type = ++spacer; // Set both to the empty string.
}
- if (os::obsolete_option(option)) {
- jio_fprintf(defaultStream::error_stream(),
- "Obsolete %s%soption: %s\n", option_type, spacer,
- option->optionString);
- return false;
- } else {
- jio_fprintf(defaultStream::error_stream(),
- "Unrecognized %s%soption: %s\n", option_type, spacer,
- option->optionString);
- return true;
- }
+ jio_fprintf(defaultStream::error_stream(),
+ "Unrecognized %s%soption: %s\n", option_type, spacer,
+ option->optionString);
+ return true;
}
static const char* user_assertion_options[] = {
--- a/src/hotspot/share/runtime/os.hpp Tue Nov 13 13:42:39 2018 -0800
+++ b/src/hotspot/share/runtime/os.hpp Tue Nov 13 16:49:58 2018 -0500
@@ -802,9 +802,6 @@
// System loadavg support. Returns -1 if load average cannot be obtained.
static int loadavg(double loadavg[], int nelem);
- // Hook for os specific jvm options that we don't want to abort on seeing
- static bool obsolete_option(const JavaVMOption *option);
-
// Amount beyond the callee frame size that we bang the stack.
static int extra_bang_size_in_bytes();