*** old/src/share/vm/runtime/commandLineFlagConstraintList.cpp	Tue Jun 16 15:47:59 2015
--- new/src/share/vm/runtime/commandLineFlagConstraintList.cpp	Tue Jun 16 15:47:59 2015

*** 29,45 ****
--- 29,46 ----
  #include "runtime/arguments.hpp"
  #include "runtime/commandLineFlagConstraintList.hpp"
  #include "runtime/commandLineFlagConstraintsCompiler.hpp"
  #include "runtime/commandLineFlagConstraintsGC.hpp"
  #include "runtime/commandLineFlagConstraintsRuntime.hpp"
- #include "runtime/os_ext.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;
    }
  
    Flag::Error apply_bool(bool* value, bool verbose) {

*** 49,58 ****
--- 50,60 ----
  
  class CommandLineFlagConstraint_int : public CommandLineFlagConstraint {
    CommandLineFlagConstraintFunc_int _constraint;
  
  public:
+   // the "name" argument must be a string literal
    CommandLineFlagConstraint_int(const char* name, CommandLineFlagConstraintFunc_int func) : CommandLineFlagConstraint(name) {
      _constraint=func;
    }
  
    Flag::Error apply_int(int* value, bool verbose) {

*** 62,71 ****
--- 64,74 ----
  
  class CommandLineFlagConstraint_intx : public CommandLineFlagConstraint {
    CommandLineFlagConstraintFunc_intx _constraint;
  
  public:
+   // the "name" argument must be a string literal
    CommandLineFlagConstraint_intx(const char* name, CommandLineFlagConstraintFunc_intx func) : CommandLineFlagConstraint(name) {
      _constraint=func;
    }
  
    Flag::Error apply_intx(intx* value, bool verbose) {

*** 75,84 ****
--- 78,88 ----
  
  class CommandLineFlagConstraint_uint : public CommandLineFlagConstraint {
    CommandLineFlagConstraintFunc_uint _constraint;
  
  public:
+   // the "name" argument must be a string literal
    CommandLineFlagConstraint_uint(const char* name, CommandLineFlagConstraintFunc_uint func) : CommandLineFlagConstraint(name) {
      _constraint=func;
    }
  
    Flag::Error apply_uint(uint* value, bool verbose) {

*** 88,97 ****
--- 92,102 ----
  
  class CommandLineFlagConstraint_uintx : public CommandLineFlagConstraint {
    CommandLineFlagConstraintFunc_uintx _constraint;
  
  public:
+   // the "name" argument must be a string literal
    CommandLineFlagConstraint_uintx(const char* name, CommandLineFlagConstraintFunc_uintx func) : CommandLineFlagConstraint(name) {
      _constraint=func;
    }
  
    Flag::Error apply_uintx(uintx* value, bool verbose) {

*** 101,110 ****
--- 106,116 ----
  
  class CommandLineFlagConstraint_uint64_t : public CommandLineFlagConstraint {
    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;
    }
  
    Flag::Error apply_uint64_t(uint64_t* value, bool verbose) {

*** 114,123 ****
--- 120,130 ----
  
  class CommandLineFlagConstraint_size_t : public CommandLineFlagConstraint {
    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;
    }
  
    Flag::Error apply_size_t(size_t* value, bool verbose) {

*** 127,136 ****
--- 134,144 ----
  
  class CommandLineFlagConstraint_double : public CommandLineFlagConstraint {
    CommandLineFlagConstraintFunc_double _constraint;
  
  public:
+   // the "name" argument must be a string literal
    CommandLineFlagConstraint_double(const char* name, CommandLineFlagConstraintFunc_double func) : CommandLineFlagConstraint(name) {
      _constraint=func;
    }
  
    Flag::Error apply_double(double* value, bool verbose) {

*** 193,202 ****
--- 201,211 ----
  #define EMIT_CONSTRAINT_LP64_PRODUCT_FLAG(type, name, value, doc) ); emit_constraint_##type(#name
  
  // 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;
  
  // Check the ranges of all flags that have them or print them out and exit if requested
  void CommandLineFlagConstraintList::init(void) {

*** 266,276 ****
--- 275,285 ----
  
  CommandLineFlagConstraint* CommandLineFlagConstraintList::find(const char* name) {
    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;
      }
    }
    return found;