# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1423251119 28800
# Node ID 9ee881900cf5b7f0f3f18616f020826b63b25d09
# Parent  e99be967a753cd6e5c70452eeb93ff6826b9f468
PrintFlagsWithComments should respect UnlockDiagnosticVMOptions

diff -r e99be967a753 -r 9ee881900cf5 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Fri Feb 06 18:03:49 2015 +0100
+++ b/src/share/vm/runtime/arguments.cpp	Fri Feb 06 11:31:59 2015 -0800
@@ -3585,6 +3585,12 @@
     if (match_option(option, "-XX:-IgnoreUnrecognizedVMOptions", &tail)) {
       IgnoreUnrecognizedVMOptions = false;
     }
+    if (match_option(option, "-XX:+UnlockDiagnosticVMOptions", &tail)) {
+      UnlockDiagnosticVMOptions = true;
+    }
+    if (match_option(option, "-XX:-UnlockDiagnosticVMOptions", &tail)) {
+      UnlockDiagnosticVMOptions = false;
+    }
     if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) {
       CommandLineFlags::printFlags(tty, false);
       vm_exit(0);