truffle: src/share/vm/runtime/arguments.cpp comparison

7034133: cleanup obsolete option handling Reviewed-by: ysr, johnc, poonam

comparison

equal deleted inserted replaced

-:e1162778c1c8
+:9c4f56ff88e9
 bool Arguments::process_argument(const char* arg,
 jboolean ignore_unrecognized, FlagValueOrigin origin) {
 JDK_Version since = JDK_Version();
-if (parse_argument(arg, origin)) {
+if (parse_argument(arg, origin) || ignore_unrecognized) {
-// do nothing
+return true;
-} else if (is_newly_obsolete(arg, &since)) {
+}
-enum { bufsize = 256 };
-char buffer[bufsize];
+const char * const argname = *arg == '+' || *arg == '-' ? arg + 1 : arg;
-since.to_string(buffer, bufsize);
+if (is_newly_obsolete(arg, &since)) {
-jio_fprintf(defaultStream::error_stream(),
+char version[256];
-"Warning: The flag %s has been EOL'd as of %s and will"
+since.to_string(version, sizeof(version));
-" be ignored\n", arg, buffer);
+warning("ignoring option %s; support was removed in %s", argname, version);
-} else {
+return true;
-if (!ignore_unrecognized) {
+}
-jio_fprintf(defaultStream::error_stream(),
-"Unrecognized VM option '%s'\n", arg);
+jio_fprintf(defaultStream::error_stream(),
-// allow for commandline "commenting out" options like -XX:#+Verbose
+"Unrecognized VM option '%s'\n", argname);
-if (strlen(arg) == 0 || arg[0] != '#') {
+// allow for commandline "commenting out" options like -XX:#+Verbose
-return false;
+return arg[0] == '#';
-}
-}
-}
-return true;
 }
 bool Arguments::process_settings_file(const char* file_name, bool should_exist, jboolean ignore_unrecognized) {
 FILE* stream = fopen(file_name, "rb");
 if (stream == NULL) {

Mercurial > hg > truffle