mirror of
https://github.com/openjdk/jdk.git
synced 2026-04-29 00:02:34 +00:00
8373481: Remove the deprecated -noclassgc, -noverify, -Xverify:none and -verifyremote options from the java launcher
Reviewed-by: lancea, dholmes, alanb
This commit is contained in:
parent
ee85834b07
commit
0566c79eb2
@ -198,7 +198,7 @@ void JvmtiExtensions::register_extensions() {
|
||||
static jvmtiExtensionFunctionInfo ext_func0 = {
|
||||
(jvmtiExtensionFunction)IsClassUnloadingEnabled,
|
||||
(char*)"com.sun.hotspot.functions.IsClassUnloadingEnabled",
|
||||
(char*)"Tell if class unloading is enabled (-noclassgc)",
|
||||
(char*)"Tell if class unloading is enabled (-Xnoclassgc)",
|
||||
sizeof(func_params0)/sizeof(func_params0[0]),
|
||||
func_params0,
|
||||
0, // no non-universal errors
|
||||
|
||||
@ -2352,14 +2352,6 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args, JVMFlagOrigin
|
||||
if (FLAG_SET_CMDLINE(BytecodeVerificationRemote, true) != JVMFlag::SUCCESS) {
|
||||
return JNI_EINVAL;
|
||||
}
|
||||
} else if (strcmp(tail, ":none") == 0) {
|
||||
if (FLAG_SET_CMDLINE(BytecodeVerificationLocal, false) != JVMFlag::SUCCESS) {
|
||||
return JNI_EINVAL;
|
||||
}
|
||||
if (FLAG_SET_CMDLINE(BytecodeVerificationRemote, false) != JVMFlag::SUCCESS) {
|
||||
return JNI_EINVAL;
|
||||
}
|
||||
warning("Options -Xverify:none and -noverify were deprecated in JDK 13 and will likely be removed in a future release.");
|
||||
} else if (is_bad_option(option, args->ignoreUnrecognized, "verification")) {
|
||||
return JNI_EINVAL;
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Copyright (c) 2007, 2025, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2007, 2026, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -197,8 +197,6 @@ java.launcher.X.usage=\n\
|
||||
\ The actual size may be rounded up to a multiple of the\n\
|
||||
\ system page size as required by the operating system.\n\
|
||||
\ -Xverify sets the mode of the bytecode verifier\n\
|
||||
\ Note that option -Xverify:none is deprecated and\n\
|
||||
\ may be removed in a future release.\n\
|
||||
\ --add-reads <module>=<target-module>(,<target-module>)*\n\
|
||||
\ updates <module> to read <target-module>, regardless\n\
|
||||
\ of module declaration. \n\
|
||||
|
||||
@ -1303,21 +1303,9 @@ ParseArguments(int *pargc, char ***pargv,
|
||||
AddOption("-verbose:gc", NULL);
|
||||
} else if (JLI_StrCmp(arg, "-debug") == 0) {
|
||||
JLI_ReportErrorMessage(ARG_DEPRECATED, "-debug");
|
||||
} else if (JLI_StrCmp(arg, "-noclassgc") == 0) {
|
||||
JLI_ReportErrorMessage(ARG_DEPRECATED, "-noclassgc");
|
||||
AddOption("-Xnoclassgc", NULL);
|
||||
} else if (JLI_StrCmp(arg, "-verify") == 0) {
|
||||
JLI_ReportErrorMessage(ARG_DEPRECATED, "-verify");
|
||||
AddOption("-Xverify:all", NULL);
|
||||
} else if (JLI_StrCmp(arg, "-verifyremote") == 0) {
|
||||
JLI_ReportErrorMessage(ARG_DEPRECATED, "-verifyremote");
|
||||
AddOption("-Xverify:remote", NULL);
|
||||
} else if (JLI_StrCmp(arg, "-noverify") == 0) {
|
||||
/*
|
||||
* Note that no 'deprecated' message is needed here because the VM
|
||||
* issues 'deprecated' messages for -noverify and -Xverify:none.
|
||||
*/
|
||||
AddOption("-Xverify:none", NULL);
|
||||
} else if (JLI_StrCCmp(arg, "-ss") == 0 ||
|
||||
JLI_StrCCmp(arg, "-ms") == 0 ||
|
||||
JLI_StrCCmp(arg, "-mx") == 0) {
|
||||
|
||||
@ -989,7 +989,6 @@ public class TTY implements EventNotifier {
|
||||
// Old-style options (These should remain in place as long as
|
||||
// the standard VM accepts them)
|
||||
token.equals("-verify") ||
|
||||
token.equals("-verifyremote") ||
|
||||
token.equals("-verbosegc")) {
|
||||
|
||||
javaArgs = addArgument(javaArgs, token);
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
* @summary barrier expansion breaks if barrier is right after call to rethrow stub
|
||||
* @requires vm.gc.Shenandoah
|
||||
*
|
||||
* @run main/othervm -XX:CompileOnly=CallMultipleCatchProjs::test -Xcomp -Xverify:none -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC CallMultipleCatchProjs
|
||||
* @run main/othervm -XX:CompileOnly=CallMultipleCatchProjs::test -Xcomp -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC CallMultipleCatchProjs
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user