src/share/vm/runtime/globals.hpp

*** 88,97 ****
--- 88,100 ----
  
  struct Flag {
    const char *type;
    const char *name;
    void*       addr;
+ 
+   NOT_PRODUCT(const char *doc;)
+ 
    const char *kind;
    FlagValueOrigin origin;
  
    // points to all Flags static array
    static Flag *flags;
*** 129,139 ****
    bool is_unlocker() const;
    bool is_unlocked() const;
    bool is_writeable() const;
    bool is_external() const;
  
!   void print_on(outputStream* st);
    void print_as_flag(outputStream* st);
  };
  
  // debug flags control various aspects of the VM and are global accessible
  
--- 132,142 ----
    bool is_unlocker() const;
    bool is_unlocked() const;
    bool is_writeable() const;
    bool is_external() const;
  
!   void print_on(outputStream* st, bool withComments = false );
    void print_as_flag(outputStream* st);
  };
  
  // debug flags control various aspects of the VM and are global accessible
  
*** 209,219 ****
  
    // Returns false if name is not a command line flag.
    static bool wasSetOnCmdline(const char* name, bool* value);
    static void printSetFlags();
  
!   static void printFlags();
  
    static void verify() PRODUCT_RETURN;
  };
  
  // use this for flags that are true by default in the debug version but
--- 212,222 ----
  
    // Returns false if name is not a command line flag.
    static bool wasSetOnCmdline(const char* name, bool* value);
    static void printSetFlags();
  
!   static void printFlags(bool withComments = false );
  
    static void verify() PRODUCT_RETURN;
  };
  
  // use this for flags that are true by default in the debug version but
*** 2404,2413 ****
--- 2407,2419 ----
           "Print all VM flags before argument processing and exit VM")       \
                                                                              \
    product(bool, PrintFlagsFinal, false,                                     \
           "Print all VM flags after argument and ergonomic processing")      \
                                                                              \
+   notproduct(bool, PrintFlagsWithComments, false,                           \
+          "Print all VM flags with default values and descriptions and exit")\
+                                                                             \
    diagnostic(bool, SerializeVMOutput, true,                                 \
           "Use a mutex to serialize output to tty and hotspot.log")          \
                                                                              \
    diagnostic(bool, DisplayVMOutput, true,                                   \
           "Display all VM output on the tty, independently of LogVMOutput")  \