--- a/hotspot/src/share/vm/runtime/commandLineFlagConstraintList.hpp	Mon Aug 31 23:29:02 2015 +0200
+++ b/hotspot/src/share/vm/runtime/commandLineFlagConstraintList.hpp	Mon Aug 31 11:51:29 2015 -0700
@@ -54,9 +54,9 @@
   enum ConstraintType {
     // Will be validated during argument processing (Arguments::parse_argument).
     AtParse         = 0,
-    // Will be validated by CommandLineFlags::check_constraints_of_after_ergo().
-    AfterErgo      = 1,
-    // Will be validated by CommandLineFlags::check_constraints_of_after_memory_init().
+    // Will be validated by CommandLineFlagConstraintList::check_constraints(AfterErgo).
+    AfterErgo       = 1,
+    // Will be validated by CommandLineFlagConstraintList::check_constraints(AfterMemoryInit).
     AfterMemoryInit = 2
   };