From 0566c79eb283650372bf4895dd825bbb43a98fe2 Mon Sep 17 00:00:00 2001 From: Jaikiran Pai Date: Tue, 28 Apr 2026 11:06:35 +0000 Subject: [PATCH] 8373481: Remove the deprecated -noclassgc, -noverify, -Xverify:none and -verifyremote options from the java launcher Reviewed-by: lancea, dholmes, alanb --- src/hotspot/share/prims/jvmtiExtensions.cpp | 2 +- src/hotspot/share/runtime/arguments.cpp | 8 -------- .../sun/launcher/resources/launcher.properties | 4 +--- src/java.base/share/native/libjli/java.c | 12 ------------ .../classes/com/sun/tools/example/debug/tty/TTY.java | 1 - .../shenandoah/compiler/CallMultipleCatchProjs.java | 2 +- 6 files changed, 3 insertions(+), 26 deletions(-) diff --git a/src/hotspot/share/prims/jvmtiExtensions.cpp b/src/hotspot/share/prims/jvmtiExtensions.cpp index 855c7bd4eba..332d4655715 100644 --- a/src/hotspot/share/prims/jvmtiExtensions.cpp +++ b/src/hotspot/share/prims/jvmtiExtensions.cpp @@ -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 diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp index 90bffbce0c0..fe5222df345 100644 --- a/src/hotspot/share/runtime/arguments.cpp +++ b/src/hotspot/share/runtime/arguments.cpp @@ -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; } diff --git a/src/java.base/share/classes/sun/launcher/resources/launcher.properties b/src/java.base/share/classes/sun/launcher/resources/launcher.properties index 739ef8b8a29..ddae0e1317c 100644 --- a/src/java.base/share/classes/sun/launcher/resources/launcher.properties +++ b/src/java.base/share/classes/sun/launcher/resources/launcher.properties @@ -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 =(,)*\n\ \ updates to read , regardless\n\ \ of module declaration. \n\ diff --git a/src/java.base/share/native/libjli/java.c b/src/java.base/share/native/libjli/java.c index e19ba280fa7..4c3b503b08a 100644 --- a/src/java.base/share/native/libjli/java.c +++ b/src/java.base/share/native/libjli/java.c @@ -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) { diff --git a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java index 94d06363dd1..ca2fa7ff15f 100644 --- a/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java +++ b/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty/TTY.java @@ -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); diff --git a/test/hotspot/jtreg/gc/shenandoah/compiler/CallMultipleCatchProjs.java b/test/hotspot/jtreg/gc/shenandoah/compiler/CallMultipleCatchProjs.java index 6a3fe5bb32e..b647be5f5e6 100644 --- a/test/hotspot/jtreg/gc/shenandoah/compiler/CallMultipleCatchProjs.java +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/CallMultipleCatchProjs.java @@ -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 * */