1.1 --- a/src/share/vm/runtime/arguments.cpp Fri Sep 05 00:28:43 2014 +0200
1.2 +++ b/src/share/vm/runtime/arguments.cpp Fri Sep 05 12:36:37 2014 -0700
1.3 @@ -35,6 +35,7 @@
1.4 #include "oops/oop.inline.hpp"
1.5 #include "prims/jvmtiExport.hpp"
1.6 #include "runtime/arguments.hpp"
1.7 +#include "runtime/arguments_ext.hpp"
1.8 #include "runtime/globals_extension.hpp"
1.9 #include "runtime/java.hpp"
1.10 #include "services/management.hpp"
1.11 @@ -1544,7 +1545,7 @@
1.12
1.13 void Arguments::select_gc() {
1.14 if (!gc_selected()) {
1.15 - select_gc_ergonomically();
1.16 + ArgumentsExt::select_gc_ergonomically();
1.17 }
1.18 }
1.19
1.20 @@ -2033,7 +2034,7 @@
1.21 }
1.22
1.23 // Check consistency of GC selection
1.24 -bool Arguments::check_gc_consistency() {
1.25 +bool Arguments::check_gc_consistency_user() {
1.26 check_gclog_consistency();
1.27 bool status = true;
1.28 // Ensure that the user has not selected conflicting sets
1.29 @@ -2199,7 +2200,7 @@
1.30 FLAG_SET_DEFAULT(UseGCOverheadLimit, false);
1.31 }
1.32
1.33 - status = status && check_gc_consistency();
1.34 + status = status && ArgumentsExt::check_gc_consistency_user();
1.35 status = status && check_stack_pages();
1.36
1.37 if (CMSIncrementalMode) {
1.38 @@ -2447,8 +2448,6 @@
1.39 warning("The VM option CICompilerCountPerCPU overrides CICompilerCount.");
1.40 }
1.41
1.42 - status &= check_vm_args_consistency_ext();
1.43 -
1.44 return status;
1.45 }
1.46
1.47 @@ -3419,7 +3418,7 @@
1.48 }
1.49 }
1.50
1.51 - if (!check_vm_args_consistency()) {
1.52 + if (!ArgumentsExt::check_vm_args_consistency()) {
1.53 return JNI_ERR;
1.54 }
1.55
1.56 @@ -3793,7 +3792,7 @@
1.57 set_shared_spaces_flags();
1.58
1.59 // Check the GC selections again.
1.60 - if (!check_gc_consistency()) {
1.61 + if (!ArgumentsExt::check_gc_consistency_ergo()) {
1.62 return JNI_EINVAL;
1.63 }
1.64
