--- old/src/share/vm/runtime/commandLineFlagConstraintList.cpp	2015-06-16 15:47:59.000000000 -0500
+++ new/src/share/vm/runtime/commandLineFlagConstraintList.cpp	2015-06-16 15:47:59.000000000 -0500
@@ -31,13 +31,14 @@
 #include "runtime/commandLineFlagConstraintsCompiler.hpp"
 #include "runtime/commandLineFlagConstraintsGC.hpp"
 #include "runtime/commandLineFlagConstraintsRuntime.hpp"
-#include "runtime/os_ext.hpp"
+#include "runtime/os.hpp"
 #include "utilities/macros.hpp"
 
 class CommandLineFlagConstraint_bool : public CommandLineFlagConstraint {
   CommandLineFlagConstraintFunc_bool _constraint;
 
 public:
+  // the "name" argument must be a string literal
   CommandLineFlagConstraint_bool(const char* name, CommandLineFlagConstraintFunc_bool func) : CommandLineFlagConstraint(name) {
     _constraint=func;
   }
@@ -51,6 +52,7 @@
   CommandLineFlagConstraintFunc_int _constraint;
 
 public:
+  // the "name" argument must be a string literal
   CommandLineFlagConstraint_int(const char* name, CommandLineFlagConstraintFunc_int func) : CommandLineFlagConstraint(name) {
     _constraint=func;
   }
@@ -64,6 +66,7 @@
   CommandLineFlagConstraintFunc_intx _constraint;
 
 public:
+  // the "name" argument must be a string literal
   CommandLineFlagConstraint_intx(const char* name, CommandLineFlagConstraintFunc_intx func) : CommandLineFlagConstraint(name) {
     _constraint=func;
   }
@@ -77,6 +80,7 @@
   CommandLineFlagConstraintFunc_uint _constraint;
 
 public:
+  // the "name" argument must be a string literal
   CommandLineFlagConstraint_uint(const char* name, CommandLineFlagConstraintFunc_uint func) : CommandLineFlagConstraint(name) {
     _constraint=func;
   }
@@ -90,6 +94,7 @@
   CommandLineFlagConstraintFunc_uintx _constraint;
 
 public:
+  // the "name" argument must be a string literal
   CommandLineFlagConstraint_uintx(const char* name, CommandLineFlagConstraintFunc_uintx func) : CommandLineFlagConstraint(name) {
     _constraint=func;
   }
@@ -103,6 +108,7 @@
   CommandLineFlagConstraintFunc_uint64_t _constraint;
 
 public:
+  // the "name" argument must be a string literal
   CommandLineFlagConstraint_uint64_t(const char* name, CommandLineFlagConstraintFunc_uint64_t func) : CommandLineFlagConstraint(name) {
     _constraint=func;
   }
@@ -116,6 +122,7 @@
   CommandLineFlagConstraintFunc_size_t _constraint;
 
 public:
+  // the "name" argument must be a string literal
   CommandLineFlagConstraint_size_t(const char* name, CommandLineFlagConstraintFunc_size_t func) : CommandLineFlagConstraint(name) {
     _constraint=func;
   }
@@ -129,6 +136,7 @@
   CommandLineFlagConstraintFunc_double _constraint;
 
 public:
+  // the "name" argument must be a string literal
   CommandLineFlagConstraint_double(const char* name, CommandLineFlagConstraintFunc_double func) : CommandLineFlagConstraint(name) {
     _constraint=func;
   }
@@ -195,6 +203,7 @@
 // Generate func argument to pass into emit_constraint_xxx functions
 #define EMIT_CONSTRAINT_CHECK(func)                               , func
 
+// the "name" argument must be a string literal
 #define INITIAL_CONTRAINTS_SIZE 16
 GrowableArray<CommandLineFlagConstraint*>* CommandLineFlagConstraintList::_constraints = NULL;
 
@@ -268,7 +277,7 @@
   CommandLineFlagConstraint* found = NULL;
   for (int i=0; i<length(); i++) {
     CommandLineFlagConstraint* constraint = at(i);
-    if (strcmp(constraint->_name, name) == 0) {
+    if (strcmp(constraint->name(), name) == 0) {
       found = constraint;
       break;
     }