1.1 --- a/src/share/vm/runtime/arguments.hpp Fri Sep 05 00:28:43 2014 +0200
1.2 +++ b/src/share/vm/runtime/arguments.hpp Fri Sep 05 12:36:37 2014 -0700
1.3 @@ -465,12 +465,12 @@
1.4 static bool verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_heap_free_ratio);
1.5
1.6 // Check for consistency in the selection of the garbage collector.
1.7 - static bool check_gc_consistency();
1.8 + static bool check_gc_consistency_user(); // Check user-selected gc
1.9 + static inline bool check_gc_consistency_ergo(); // Check ergonomic-selected gc
1.10 static void check_deprecated_gcs();
1.11 static void check_deprecated_gc_flags();
1.12 // Check consistecy or otherwise of VM argument settings
1.13 static bool check_vm_args_consistency();
1.14 - static bool check_vm_args_consistency_ext();
1.15 // Check stack pages settings
1.16 static bool check_stack_pages();
1.17 // Used by os_solaris
1.18 @@ -611,4 +611,9 @@
1.19 return UseConcMarkSweepGC || UseG1GC || UseParallelGC || UseParallelOldGC ||
1.20 UseParNewGC || UseSerialGC;
1.21 }
1.22 +
1.23 +bool Arguments::check_gc_consistency_ergo() {
1.24 + return check_gc_consistency_user();
1.25 +}
1.26 +
1.27 #endif // SHARE_VM_RUNTIME_ARGUMENTS_HPP
