diff -r 08f642d9214f -r e0a340f4ab6e hotspot/src/share/vm/runtime/commandLineFlagConstraintList.hpp
--- a/hotspot/src/share/vm/runtime/commandLineFlagConstraintList.hpp	Thu Oct 15 17:35:42 2015 +0200
+++ b/hotspot/src/share/vm/runtime/commandLineFlagConstraintList.hpp	Thu Oct 15 13:34:21 2015 -0500
@@ -54,9 +54,9 @@
   enum ConstraintType {
     // Will be validated during argument processing (Arguments::parse_argument).
     AtParse         = 0,
-    // Will be validated by CommandLineFlagConstraintList::check_constraints(AfterErgo).
+    // Will be validated inside Threads::create_vm(), right after Arguments::apply_ergo().
     AfterErgo       = 1,
-    // Will be validated by CommandLineFlagConstraintList::check_constraints(AfterMemoryInit).
+    // Will be validated inside universe_init(), right after Metaspace::global_initialize().
     AfterMemoryInit = 2
   };