--- old/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp	2018-05-23 14:52:04.000000000 -0500
+++ new/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp	2018-05-23 14:52:03.000000000 -0500
@@ -24,7 +24,7 @@
 
 #include "precompiled.hpp"
 #include "gc/g1/heapRegionBounds.inline.hpp"
-#include "runtime/flags/jvmFlagRangeList.hpp"
+#include "gc/g1/jvmFlagConstraintsG1.hpp"
 #include "runtime/globals_extension.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -34,7 +34,7 @@
   // Default value of G1RSetRegionEntries=0 means will be set ergonomically.
   // Minimum value is 1.
   if (FLAG_IS_CMDLINE(G1RSetRegionEntries) && (value < 1)) {
-    CommandLineError::print(verbose,
+    JVMFlag::printError(verbose,
                             "G1RSetRegionEntries (" INTX_FORMAT ") must be "
                             "greater than or equal to 1\n",
                             value);
@@ -50,7 +50,7 @@
   // Default value of G1RSetSparseRegionEntries=0 means will be set ergonomically.
   // Minimum value is 1.
   if (FLAG_IS_CMDLINE(G1RSetSparseRegionEntries) && (value < 1)) {
-    CommandLineError::print(verbose,
+    JVMFlag::printError(verbose,
                             "G1RSetSparseRegionEntries (" INTX_FORMAT ") must be "
                             "greater than or equal to 1\n",
                             value);
@@ -65,7 +65,7 @@
 
   // Default value of G1HeapRegionSize=0 means will be set ergonomically.
   if (FLAG_IS_CMDLINE(G1HeapRegionSize) && (value < HeapRegionBounds::min_size())) {
-    CommandLineError::print(verbose,
+    JVMFlag::printError(verbose,
                             "G1HeapRegionSize (" SIZE_FORMAT ") must be "
                             "greater than or equal to ergonomic heap region minimum size\n",
                             value);
@@ -79,7 +79,7 @@
   if (!UseG1GC) return JVMFlag::SUCCESS;
 
   if (value > G1MaxNewSizePercent) {
-    CommandLineError::print(verbose,
+    JVMFlag::printError(verbose,
                             "G1NewSizePercent (" UINTX_FORMAT ") must be "
                             "less than or equal to G1MaxNewSizePercent (" UINTX_FORMAT ")\n",
                             value, G1MaxNewSizePercent);
@@ -93,7 +93,7 @@
   if (!UseG1GC) return JVMFlag::SUCCESS;
 
   if (value < G1NewSizePercent) {
-    CommandLineError::print(verbose,
+    JVMFlag::printError(verbose,
                             "G1MaxNewSizePercent (" UINTX_FORMAT ") must be "
                             "greater than or equal to G1NewSizePercent (" UINTX_FORMAT ")\n",
                             value, G1NewSizePercent);
@@ -105,7 +105,7 @@
 
 JVMFlag::Error MaxGCPauseMillisConstraintFuncG1(uintx value, bool verbose) {
   if (UseG1GC && FLAG_IS_CMDLINE(MaxGCPauseMillis) && (value >= GCPauseIntervalMillis)) {
-    CommandLineError::print(verbose,
+    JVMFlag::printError(verbose,
                             "MaxGCPauseMillis (" UINTX_FORMAT ") must be "
                             "less than GCPauseIntervalMillis (" UINTX_FORMAT ")\n",
                             value, GCPauseIntervalMillis);
@@ -119,7 +119,7 @@
   if (UseG1GC) {
     if (FLAG_IS_CMDLINE(GCPauseIntervalMillis)) {
       if (value < 1) {
-        CommandLineError::print(verbose,
+        JVMFlag::printError(verbose,
                                 "GCPauseIntervalMillis (" UINTX_FORMAT ") must be "
                                 "greater than or equal to 1\n",
                                 value);
@@ -127,14 +127,14 @@
       }
 
       if (FLAG_IS_DEFAULT(MaxGCPauseMillis)) {
-        CommandLineError::print(verbose,
+        JVMFlag::printError(verbose,
                                 "GCPauseIntervalMillis cannot be set "
                                 "without setting MaxGCPauseMillis\n");
         return JVMFlag::VIOLATES_CONSTRAINT;
       }
 
       if (value <= MaxGCPauseMillis) {
-        CommandLineError::print(verbose,
+        JVMFlag::printError(verbose,
                                 "GCPauseIntervalMillis (" UINTX_FORMAT ") must be "
                                 "greater than MaxGCPauseMillis (" UINTX_FORMAT ")\n",
                                 value, MaxGCPauseMillis);
@@ -153,7 +153,7 @@
   // i.e. result of '(uint)(NewSize / region size(1~32MB))'
   // So maximum of NewSize should be 'max_juint * 1M'
   if (UseG1GC && (value > (max_juint * 1 * M))) {
-    CommandLineError::print(verbose,
+    JVMFlag::printError(verbose,
                             "NewSize (" SIZE_FORMAT ") must be less than ergonomic maximum value\n",
                             value);
     return JVMFlag::VIOLATES_CONSTRAINT;