src/share/vm/runtime/arguments.cpp

*** 2828,2838 ****
--- 2828,2845 ----
      }
      if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) {
        CommandLineFlags::printFlags();
        vm_exit(0);
      }
+ 
+ #ifndef PRODUCT
+     if (match_option(option, "-XX:+PrintFlagsWithComments", &tail)) {
+       CommandLineFlags::printFlags(true);
+       vm_exit(0);
      }
+ #endif
+   }
  
    if (IgnoreUnrecognizedVMOptions) {
      // uncast const to modify the flag args->ignoreUnrecognized
      *(jboolean*)(&args->ignoreUnrecognized) = true;
    }