--- a/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp	Tue May 29 13:44:44 2018 +0200
+++ b/src/hotspot/share/gc/g1/jvmFlagConstraintsG1.cpp	Tue May 29 11:04:56 2018 -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,10 +34,10 @@
   // Default value of G1RSetRegionEntries=0 means will be set ergonomically.
   // Minimum value is 1.
   if (FLAG_IS_CMDLINE(G1RSetRegionEntries) && (value < 1)) {
-    CommandLineError::print(verbose,
-                            "G1RSetRegionEntries (" INTX_FORMAT ") must be "
-                            "greater than or equal to 1\n",
-                            value);
+    JVMFlag::printError(verbose,
+                        "G1RSetRegionEntries (" INTX_FORMAT ") must be "
+                        "greater than or equal to 1\n",
+                        value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -50,10 +50,10 @@
   // Default value of G1RSetSparseRegionEntries=0 means will be set ergonomically.
   // Minimum value is 1.
   if (FLAG_IS_CMDLINE(G1RSetSparseRegionEntries) && (value < 1)) {
-    CommandLineError::print(verbose,
-                            "G1RSetSparseRegionEntries (" INTX_FORMAT ") must be "
-                            "greater than or equal to 1\n",
-                            value);
+    JVMFlag::printError(verbose,
+                        "G1RSetSparseRegionEntries (" INTX_FORMAT ") must be "
+                        "greater than or equal to 1\n",
+                        value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -65,10 +65,10 @@
 
   // Default value of G1HeapRegionSize=0 means will be set ergonomically.
   if (FLAG_IS_CMDLINE(G1HeapRegionSize) && (value < HeapRegionBounds::min_size())) {
-    CommandLineError::print(verbose,
-                            "G1HeapRegionSize (" SIZE_FORMAT ") must be "
-                            "greater than or equal to ergonomic heap region minimum size\n",
-                            value);
+    JVMFlag::printError(verbose,
+                        "G1HeapRegionSize (" SIZE_FORMAT ") must be "
+                        "greater than or equal to ergonomic heap region minimum size\n",
+                        value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -79,10 +79,10 @@
   if (!UseG1GC) return JVMFlag::SUCCESS;
 
   if (value > G1MaxNewSizePercent) {
-    CommandLineError::print(verbose,
-                            "G1NewSizePercent (" UINTX_FORMAT ") must be "
-                            "less than or equal to G1MaxNewSizePercent (" UINTX_FORMAT ")\n",
-                            value, G1MaxNewSizePercent);
+    JVMFlag::printError(verbose,
+                        "G1NewSizePercent (" UINTX_FORMAT ") must be "
+                        "less than or equal to G1MaxNewSizePercent (" UINTX_FORMAT ")\n",
+                        value, G1MaxNewSizePercent);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -93,10 +93,10 @@
   if (!UseG1GC) return JVMFlag::SUCCESS;
 
   if (value < G1NewSizePercent) {
-    CommandLineError::print(verbose,
-                            "G1MaxNewSizePercent (" UINTX_FORMAT ") must be "
-                            "greater than or equal to G1NewSizePercent (" UINTX_FORMAT ")\n",
-                            value, G1NewSizePercent);
+    JVMFlag::printError(verbose,
+                        "G1MaxNewSizePercent (" UINTX_FORMAT ") must be "
+                        "greater than or equal to G1NewSizePercent (" UINTX_FORMAT ")\n",
+                        value, G1NewSizePercent);
     return JVMFlag::VIOLATES_CONSTRAINT;
   } else {
     return JVMFlag::SUCCESS;
@@ -105,10 +105,10 @@
 
 JVMFlag::Error MaxGCPauseMillisConstraintFuncG1(uintx value, bool verbose) {
   if (UseG1GC && FLAG_IS_CMDLINE(MaxGCPauseMillis) && (value >= GCPauseIntervalMillis)) {
-    CommandLineError::print(verbose,
-                            "MaxGCPauseMillis (" UINTX_FORMAT ") must be "
-                            "less than GCPauseIntervalMillis (" UINTX_FORMAT ")\n",
-                            value, GCPauseIntervalMillis);
+    JVMFlag::printError(verbose,
+                        "MaxGCPauseMillis (" UINTX_FORMAT ") must be "
+                        "less than GCPauseIntervalMillis (" UINTX_FORMAT ")\n",
+                        value, GCPauseIntervalMillis);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 
@@ -119,25 +119,25 @@
   if (UseG1GC) {
     if (FLAG_IS_CMDLINE(GCPauseIntervalMillis)) {
       if (value < 1) {
-        CommandLineError::print(verbose,
-                                "GCPauseIntervalMillis (" UINTX_FORMAT ") must be "
-                                "greater than or equal to 1\n",
-                                value);
+        JVMFlag::printError(verbose,
+                            "GCPauseIntervalMillis (" UINTX_FORMAT ") must be "
+                            "greater than or equal to 1\n",
+                            value);
         return JVMFlag::VIOLATES_CONSTRAINT;
       }
 
       if (FLAG_IS_DEFAULT(MaxGCPauseMillis)) {
-        CommandLineError::print(verbose,
-                                "GCPauseIntervalMillis cannot be set "
-                                "without setting MaxGCPauseMillis\n");
+        JVMFlag::printError(verbose,
+                            "GCPauseIntervalMillis cannot be set "
+                            "without setting MaxGCPauseMillis\n");
         return JVMFlag::VIOLATES_CONSTRAINT;
       }
 
       if (value <= MaxGCPauseMillis) {
-        CommandLineError::print(verbose,
-                                "GCPauseIntervalMillis (" UINTX_FORMAT ") must be "
-                                "greater than MaxGCPauseMillis (" UINTX_FORMAT ")\n",
-                                value, MaxGCPauseMillis);
+        JVMFlag::printError(verbose,
+                            "GCPauseIntervalMillis (" UINTX_FORMAT ") must be "
+                            "greater than MaxGCPauseMillis (" UINTX_FORMAT ")\n",
+                            value, MaxGCPauseMillis);
         return JVMFlag::VIOLATES_CONSTRAINT;
       }
     }
@@ -153,9 +153,9 @@
   // 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,
-                            "NewSize (" SIZE_FORMAT ") must be less than ergonomic maximum value\n",
-                            value);
+    JVMFlag::printError(verbose,
+                        "NewSize (" SIZE_FORMAT ") must be less than ergonomic maximum value\n",
+                        value);
     return JVMFlag::VIOLATES_CONSTRAINT;
   }
 #endif // _LP64