--- old/src/share/vm/runtime/arguments.cpp 2015-09-28 13:36:29.000000000 -0500 +++ new/src/share/vm/runtime/arguments.cpp 2015-09-28 13:36:28.000000000 -0500 @@ -841,7 +841,7 @@ JDK_Version since = JDK_Version(); - if (parse_argument(arg, origin) || ignore_unrecognized) { + if (parse_argument(arg, origin)) { return true; } @@ -877,7 +877,7 @@ Flag* found_flag = Flag::find_flag((const char*)argname, arg_len, true, true); if (found_flag != NULL) { char locked_message_buf[BUFLEN]; - found_flag->get_locked_message(locked_message_buf, BUFLEN); + Flag::MsgType msg_type = found_flag->get_locked_message(locked_message_buf, BUFLEN); if (strlen(locked_message_buf) == 0) { if (found_flag->is_bool() && !has_plus_minus) { jio_fprintf(defaultStream::error_stream(), @@ -890,9 +890,19 @@ "Improperly specified VM option '%s'\n", argname); } } else { +#ifdef PRODUCT + bool mismatched = ((msg_type == Flag::NOTPRODUCT_FLAG_BUT_PRODUCT_BUILD) || + (msg_type == Flag::DEVELOPER_FLAG_BUT_PRODUCT_BUILD)); + if (ignore_unrecognized && mismatched) { + return true; + } +#endif jio_fprintf(defaultStream::error_stream(), "%s", locked_message_buf); } } else { + if (ignore_unrecognized) { + return true; + } jio_fprintf(defaultStream::error_stream(), "Unrecognized VM option '%s'\n", argname); Flag* fuzzy_matched = Flag::fuzzy_match((const char*)argname, arg_len, true); --- old/src/share/vm/runtime/globals.cpp 2015-09-28 13:36:29.000000000 -0500 +++ new/src/share/vm/runtime/globals.cpp 2015-09-28 13:36:29.000000000 -0500 @@ -305,35 +305,36 @@ _flags = Flags(_flags & ~KIND_DIAGNOSTIC); } -// Get custom message for this locked flag, or return NULL if -// none is available. -void Flag::get_locked_message(char* buf, int buflen) const { +// Get custom message for this locked flag, or NULL if +// none is available. Returns message type produced. +Flag::MsgType Flag::get_locked_message(char* buf, int buflen) const { buf[0] = '\0'; if (is_diagnostic() && !is_unlocked()) { jio_snprintf(buf, buflen, "Error: VM option '%s' is diagnostic and must be enabled via -XX:+UnlockDiagnosticVMOptions.\n" "Error: The unlock option must precede '%s'.\n", _name, _name); - return; + return Flag::DIAGNOSTIC_FLAG_BUT_LOCKED; } if (is_experimental() && !is_unlocked()) { jio_snprintf(buf, buflen, "Error: VM option '%s' is experimental and must be enabled via -XX:+UnlockExperimentalVMOptions.\n" "Error: The unlock option must precede '%s'.\n", _name, _name); - return; + return Flag::EXPERIMENTAL_FLAG_BUT_LOCKED; } if (is_develop() && is_product_build()) { jio_snprintf(buf, buflen, "Error: VM option '%s' is develop and is available only in debug version of VM.\n", _name); - return; + return Flag::DEVELOPER_FLAG_BUT_PRODUCT_BUILD; } if (is_notproduct() && is_product_build()) { jio_snprintf(buf, buflen, "Error: VM option '%s' is notproduct and is available only in debug version of VM.\n", _name); - return; + return Flag::NOTPRODUCT_FLAG_BUT_PRODUCT_BUILD; } get_locked_message_ext(buf, buflen); + return Flag::NONE; } bool Flag::is_writeable() const { --- old/src/share/vm/runtime/globals.hpp 2015-09-28 13:36:30.000000000 -0500 +++ new/src/share/vm/runtime/globals.hpp 2015-09-28 13:36:30.000000000 -0500 @@ -279,6 +279,14 @@ ERR_OTHER }; + enum MsgType { + NONE = 0, + DIAGNOSTIC_FLAG_BUT_LOCKED, + EXPERIMENTAL_FLAG_BUT_LOCKED, + DEVELOPER_FLAG_BUT_PRODUCT_BUILD, + NOTPRODUCT_FLAG_BUT_PRODUCT_BUILD + }; + const char* _type; const char* _name; void* _addr; @@ -364,7 +372,7 @@ void unlock_diagnostic(); - void get_locked_message(char*, int) const; + Flag::MsgType get_locked_message(char*, int) const; void get_locked_message_ext(char*, int) const; // printRanges will print out flags type, name and range values as expected by -XX:+PrintFlagsRanges --- /dev/null 2015-09-28 13:36:31.000000000 -0500 +++ new/test/runtime/8129855/IgnoreUnrecognizedVMOptions.java 2015-09-28 13:36:31.000000000 -0500 @@ -0,0 +1,234 @@ +/* + * Copyright (c) 2013, 2015, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import jdk.test.lib.*; + +/* + * @test + * @bug 8129855 + * @summary -XX:+IgnoreUnrecognizedVMOptions should work according to the spec from https://bugs.openjdk.java.net/browse/JDK-8129855?focusedCommentId=13828658&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13828658 + * + * @library /testlibrary + * @modules java.base/sun.misc + * java.management + * @run main IgnoreUnrecognizedVMOptions + */ +public class IgnoreUnrecognizedVMOptions { + + public static void main(String[] args) throws Exception { + ProcessBuilder pb; + OutputAnalyzer output; + + pb = ProcessTools.createJavaProcessBuilder("-version"); + output = new OutputAnalyzer(pb.start()); + boolean product = false; + try { + output.shouldContain("debug"); + } catch (RuntimeException e) { + product = true; + } + + /* + #1.1 normal flag: + exists, invalid value does not exist + -XX:MinHeapFreeRatio=notnum -XX:THIS_FLAG_DOESNT_EXIST + -IgnoreUnrecognizedVMOptions ERR ERR + +IgnoreUnrecognizedVMOptions ERR OK + */ + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:MinHeapFreeRatio=notnum", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:THIS_FLAG_DOESNT_EXIST", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:MinHeapFreeRatio=notnum", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:THIS_FLAG_DOESNT_EXIST", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(0); + + /* + #1.2 normal flag with ranges: + exists, in range exists, out of range + -XX:StackRedPages=1 -XX:StackRedPages=0 + -IgnoreUnrecognizedVMOptions OK ERR + +IgnoreUnrecognizedVMOptions OK ERR + */ + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:StackRedPages=1", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(0); + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:StackRedPages=0", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:StackRedPages=1", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(0); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:StackRedPages=0", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + + /* + #1.3 locked flag: + diagnostic & locked experimental & locked commercial & locked + -XX:-UnlockDiagnosticVMOptions -XX:-UnlockExperimentalVMOptions -XX:-UnlockCommercialFeatures + -XX:+PrintInlining -XX:+AlwaysSafeConstructors -XX:+FlightRecorder + -IgnoreUnrecognizedVMOptions ERR ERR ERR + +IgnoreUnrecognizedVMOptions ERR ERR ERR + */ + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:+PrintInlining", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:+AlwaysSafeConstructors", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:+FlightRecorder", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:+PrintInlining", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:+AlwaysSafeConstructors", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:+FlightRecorder", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + + /* + #1.4 develop & notproduct flag on debug VM: + develop & !product_build notproduct & !product_build + -XX:+DeoptimizeALot -XX:+VerifyCodeCache + -IgnoreUnrecognizedVMOptions OK OK + +IgnoreUnrecognizedVMOptions OK OK + */ + if (!product) { + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:+DeoptimizeALot", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(0); + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:+VerifyCodeCache", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(0); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+DeoptimizeALot", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(0); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+VerifyCodeCache", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(0); + } + + /* + #1.5 develop & notproduct flag on product VM: + develop & !product_build notproduct & !product_build + -XX:+DeoptimizeALot -XX:+VerifyCodeCache + -IgnoreUnrecognizedVMOptions ERR ERR + +IgnoreUnrecognizedVMOptions OK OK + */ + if (product) { + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:+DeoptimizeALot", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:+VerifyCodeCache", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+DeoptimizeALot", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(0); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+VerifyCodeCache", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(0); + } + + /* + #1.6 malformed locked flag: + diagnostic & locked experimental & locked commercial & locked + -XX:-UnlockDiagnosticVMOptions -XX:-UnlockExperimentalVMOptions -XX:-UnlockCommercialFeatures + -XX:PrintInlining -XX:AlwaysSafeConstructors -XX:FlightRecorder + -IgnoreUnrecognizedVMOptions ERR ERR ERR + +IgnoreUnrecognizedVMOptions ERR ERR ERR + */ + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:PrintInlining", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:AlwaysSafeConstructors", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:FlightRecorder", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:PrintInlining", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:AlwaysSafeConstructors", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:-UnlockDiagnosticVMOptions", "-XX:FlightRecorder", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + + /* + #1.7 malformed develop & notproduct flag on debug VM: + develop & !product_build notproduct & !product_build + -XX:DeoptimizeALot -XX:VerifyCodeCache + -IgnoreUnrecognizedVMOptions ERR ERR + +IgnoreUnrecognizedVMOptions ERR ERR + */ + if (!product) { + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:DeoptimizeALot", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:VerifyCodeCache", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:DeoptimizeALot", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:VerifyCodeCache", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + } + + /* + #1.8 malformed develop & notproduct flag on product VM: + develop & !product_build .notproduct & !product_build + -XX:DeoptimizeALot -XX:VerifyCodeCache + -IgnoreUnrecognizedVMOptions ERR ERR + +IgnoreUnrecognizedVMOptions OK OK + */ + if (product) { + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:DeoptimizeALot", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:-IgnoreUnrecognizedVMOptions", "-XX:VerifyCodeCache", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(1); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:DeoptimizeALot", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(0); + pb = ProcessTools.createJavaProcessBuilder("-XX:+IgnoreUnrecognizedVMOptions", "-XX:VerifyCodeCache", "-version"); + output = new OutputAnalyzer(pb.start()); + output.shouldHaveExitValue(0); + } + + } +}