src/share/vm/runtime/arguments.hpp

*** 261,270 ****
--- 261,273 ----
    static bool   _created_by_gamma_launcher;
  
    // Option flags
    static bool   _has_profile;
    static const char*  _gc_log_filename;
+   // value of the conservative maximum heap alignment needed
+   static size_t  _conservative_max_heap_alignment;
+ 
    static uintx  _min_heap_size;
  
    // -Xrun arguments
    static AgentLibraryList _libraryList;
    static void add_init_library(const char* name, char* options)
*** 306,315 ****
--- 309,319 ----
    // UseParallel[Old]GC
    static void set_parallel_gc_flags();
    // Garbage-First (UseG1GC)
    static void set_g1_gc_flags();
    // GC ergonomics
+   static void set_conservative_max_heap_alignment();
    static void set_use_compressed_oops();
    static void set_use_compressed_klass_ptrs();
    static void set_ergonomics_flags();
    static void set_shared_spaces_flags();
    // limits the given memory size by the maximum amount of memory this process is
*** 413,422 ****
--- 417,428 ----
    static char*  SharedArchivePath;
  
   public:
    // Parses the arguments
    static jint parse(const JavaVMInitArgs* args);
+   // Apply ergonomics
+   static jint apply_ergonomics();
    // Adjusts the arguments after the OS have adjusted the arguments
    static jint adjust_after_os();
    // Check for consistency in the selection of the garbage collector.
    static bool check_gc_consistency();
    static void check_deprecated_gcs();
*** 426,435 ****
--- 432,445 ----
    // Check stack pages settings
    static bool check_stack_pages();
    // Used by os_solaris
    static bool process_settings_file(const char* file_name, bool should_exist, jboolean ignore_unrecognized);
  
+   static size_t conservative_max_heap_alignment()       { return _conservative_max_heap_alignment; }
+   // return the maximum size a heap with compressed oops can take
+   static size_t max_heap_for_compressed_oops();
+ 
    // return a char* array containing all options
    static char** jvm_flags_array()          { return _jvm_flags_array; }
    static char** jvm_args_array()           { return _jvm_args_array; }
    static int num_jvm_flags()               { return _num_jvm_flags; }
    static int num_jvm_args()                { return _num_jvm_args; }