8339918: Remove checks for outdated -t -tm -Xfuture -checksource -cs -noasyncgc options from the launcher

Reviewed-by: dholmes, alanb
This commit is contained in:
Jaikiran Pai 2024-09-16 08:34:54 +00:00
parent 6be15c3d0b
commit a4eb9a063f
4 changed files with 13 additions and 28 deletions

View File

@ -141,9 +141,6 @@ java.launcher.X.usage=\n\
\ -Xcomp forces compilation of methods on first invocation\n\ \ -Xcomp forces compilation of methods on first invocation\n\
\ -Xdebug does nothing; deprecated for removal in a future release.\n\ \ -Xdebug does nothing; deprecated for removal in a future release.\n\
\ -Xdiag show additional diagnostic messages\n\ \ -Xdiag show additional diagnostic messages\n\
\ -Xfuture enable strictest checks, anticipating future default.\n\
\ This option is deprecated and may be removed in a\n\
\ future release.\n\
\ -Xint interpreted mode execution only\n\ \ -Xint interpreted mode execution only\n\
\ -Xinternalversion\n\ \ -Xinternalversion\n\
\ displays more detailed JVM version information than the\n\ \ displays more detailed JVM version information than the\n\

View File

@ -3749,12 +3749,6 @@ future JDK release.
They\[aq]re still accepted and acted upon, but a warning is issued when They\[aq]re still accepted and acted upon, but a warning is issued when
they\[aq]re used. they\[aq]re used.
.TP .TP
\f[V]-Xfuture\f[R]
Enables strict class-file format checks that enforce close conformance
to the class-file format specification.
Developers should use this flag when developing new code.
Stricter checks may become the default in future releases.
.TP
\f[V]-Xloggc:\f[R]\f[I]filename\f[R] \f[V]-Xloggc:\f[R]\f[I]filename\f[R]
Sets the file to which verbose GC events information should be Sets the file to which verbose GC events information should be
redirected for logging. redirected for logging.
@ -3920,6 +3914,16 @@ of objects reachable from the old generation space into the young
generation space. generation space.
To disable GC of the young generation before each full GC, specify the To disable GC of the young generation before each full GC, specify the
option \f[V]-XX:-ScavengeBeforeFullGC\f[R]. option \f[V]-XX:-ScavengeBeforeFullGC\f[R].
.TP
\f[V]-Xfuture\f[R]
Enables strict class-file format checks that enforce close conformance
to the class-file format specification.
Developers should use this flag when developing new code.
Stricter checks may become the default in future releases.
.RS
.PP
Use the option \f[V]-Xverify:all\f[R] instead.
.RE
.PP .PP
For the lists and descriptions of options removed in previous releases For the lists and descriptions of options removed in previous releases
see the \f[I]Removed Java Options\f[R] section in: see the \f[I]Removed Java Options\f[R] section in:

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1995, 2023, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -1464,17 +1464,10 @@ ParseArguments(int *pargc, char ***pargv,
return JNI_FALSE; return JNI_FALSE;
} else if (JLI_StrCmp(arg, "-verbosegc") == 0) { } else if (JLI_StrCmp(arg, "-verbosegc") == 0) {
AddOption("-verbose:gc", NULL); AddOption("-verbose:gc", NULL);
} else if (JLI_StrCmp(arg, "-t") == 0) {
AddOption("-Xt", NULL);
} else if (JLI_StrCmp(arg, "-tm") == 0) {
AddOption("-Xtm", NULL);
} else if (JLI_StrCmp(arg, "-debug") == 0) { } else if (JLI_StrCmp(arg, "-debug") == 0) {
JLI_ReportErrorMessage(ARG_DEPRECATED, "-debug"); JLI_ReportErrorMessage(ARG_DEPRECATED, "-debug");
} else if (JLI_StrCmp(arg, "-noclassgc") == 0) { } else if (JLI_StrCmp(arg, "-noclassgc") == 0) {
AddOption("-Xnoclassgc", NULL); AddOption("-Xnoclassgc", NULL);
} else if (JLI_StrCmp(arg, "-Xfuture") == 0) {
JLI_ReportErrorMessage(ARG_DEPRECATED, "-Xfuture");
AddOption("-Xverify:all", NULL);
} else if (JLI_StrCmp(arg, "-verify") == 0) { } else if (JLI_StrCmp(arg, "-verify") == 0) {
AddOption("-Xverify:all", NULL); AddOption("-Xverify:all", NULL);
} else if (JLI_StrCmp(arg, "-verifyremote") == 0) { } else if (JLI_StrCmp(arg, "-verifyremote") == 0) {
@ -1493,11 +1486,6 @@ ParseArguments(int *pargc, char ***pargv,
char *tmp = JLI_MemAlloc(tmpSize); char *tmp = JLI_MemAlloc(tmpSize);
snprintf(tmp, tmpSize, "-X%s", arg + 1); /* skip '-' */ snprintf(tmp, tmpSize, "-X%s", arg + 1); /* skip '-' */
AddOption(tmp, NULL); AddOption(tmp, NULL);
} else if (JLI_StrCmp(arg, "-checksource") == 0 ||
JLI_StrCmp(arg, "-cs") == 0 ||
JLI_StrCmp(arg, "-noasyncgc") == 0) {
/* No longer supported */
JLI_ReportErrorMessage(ARG_WARN, arg);
} else if (JLI_StrCCmp(arg, "-splash:") == 0) { } else if (JLI_StrCCmp(arg, "-splash:") == 0) {
; /* Ignore machine independent options already handled */ ; /* Ignore machine independent options already handled */
} else if (JLI_StrCmp(arg, "--disable-@files") == 0) { } else if (JLI_StrCmp(arg, "--disable-@files") == 0) {

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -980,7 +980,6 @@ public class TTY implements EventNotifier {
return; return;
} else if ( } else if (
// Standard VM options passed on // Standard VM options passed on
token.equals("-v") || token.startsWith("-v:") || // -v[:...]
token.startsWith("-verbose") || // -verbose[:...] token.startsWith("-verbose") || // -verbose[:...]
token.startsWith("-D") || token.startsWith("-D") ||
// -classpath handled below // -classpath handled below
@ -988,12 +987,9 @@ public class TTY implements EventNotifier {
token.startsWith("-X") || token.startsWith("-X") ||
// Old-style options (These should remain in place as long as // Old-style options (These should remain in place as long as
// the standard VM accepts them) // the standard VM accepts them)
token.equals("-noasyncgc") || token.equals("-prof") ||
token.equals("-verify") || token.equals("-verify") ||
token.equals("-verifyremote") || token.equals("-verifyremote") ||
token.equals("-verbosegc") || token.equals("-verbosegc")) {
token.startsWith("-ms") || token.startsWith("-mx") ||
token.startsWith("-ss") || token.startsWith("-oss") ) {
javaArgs = addArgument(javaArgs, token); javaArgs = addArgument(javaArgs, token);
} else if (token.startsWith("-R")) { } else if (token.startsWith("-R")) {