*** old/src/share/vm/runtime/arguments.hpp	Sat Jun 13 09:00:28 2015
--- new/src/share/vm/runtime/arguments.hpp	Sat Jun 13 09:00:28 2015

*** 326,336 ****
--- 326,335 ----
    static intx _Tier3InvokeNotifyFreqLog;
    static intx _Tier4InvocationThreshold;
  
    // Tiered
    static void set_tiered_flags();
    static int  get_min_number_of_compiler_threads();
    // CMS/ParNew garbage collectors
    static void set_parnew_gc_flags();
    static void set_cms_and_parnew_gc_flags();
    // UseParallel[Old]GC
    static void set_parallel_gc_flags();

*** 382,399 ****
--- 381,390 ----
  
    static bool is_bad_option(const JavaVMOption* option, jboolean ignore) {
      return is_bad_option(option, ignore, NULL);
    }
  
    static bool is_percentage(uintx val) {
      return val <= 100;
    }
  
    static bool verify_interval(uintx val, uintx min,
                                uintx max, const char* name);
    static bool verify_min_value(intx val, intx min, const char* name);
    static bool verify_percentage(uintx value, const char* name);
    static void describe_range_error(ArgsRange errcode);
    static ArgsRange check_memory_size(julong size, julong min_size);
    static ArgsRange parse_memory_size(const char* s, julong* long_arg,
                                       julong min_size);
    // Parse a string for a unsigned integer.  Returns true if value

*** 445,454 ****
--- 436,448 ----
    static bool   CheckCompileOnly;
  
    static char*  SharedArchivePath;
  
   public:
+   // Tiered
+   static int  get_min_number_of_compiler_threads();
+   
    // Scale compile thresholds
    // Returns threshold scaled with CompileThresholdScaling
    static intx scaled_compile_threshold(intx threshold, double scale);
    static intx scaled_compile_threshold(intx threshold) {
      return scaled_compile_threshold(threshold, CompileThresholdScaling);

*** 463,492 ****
--- 457,478 ----
    static jint parse(const JavaVMInitArgs* args);
    // Apply ergonomics
    static jint apply_ergo();
    // Adjusts the arguments after the OS have adjusted the arguments
    static jint adjust_after_os();
+   // Set any arguments that need to be set after the final range and constraint check
+   static void post_final_range_and_constraint_check(bool check_passed);
  
    static void set_gc_specific_flags();
    static inline bool gc_selected(); // whether a gc has been selected
    static void select_gc_ergonomically();
  
    // Verifies that the given value will fit as a MinHeapFreeRatio. If not, an error
    // message is returned in the provided buffer.
    static bool verify_MinHeapFreeRatio(FormatBuffer<80>& err_msg, uintx min_heap_free_ratio);
  
    // Verifies that the given value will fit as a MaxHeapFreeRatio. If not, an error
    // message is returned in the provided buffer.
    static bool verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_heap_free_ratio);
  
    // Check for consistency in the selection of the garbage collector.
    static bool check_gc_consistency();        // Check user-selected gc
    static void check_deprecated_gc_flags();
    // Check consistency or otherwise of VM argument settings
    static bool check_vm_args_consistency();
    // 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