src/share/vm/runtime/commandLineFlagConstraintList.cpp

*** 218,228 ****
  
  // Generate func argument to pass into emit_constraint_xxx functions
  #define EMIT_CONSTRAINT_CHECK(func, type)                               , func, CommandLineFlagConstraint::type
  
  // the "name" argument must be a string literal
! #define INITIAL_CONSTRAINTS_SIZE 40
  GrowableArray<CommandLineFlagConstraint*>* CommandLineFlagConstraintList::_constraints = NULL;
  CommandLineFlagConstraint::ConstraintType CommandLineFlagConstraintList::_validating_type = CommandLineFlagConstraint::AtParse;
  
  // Check the ranges of all flags that have them or print them out and exit if requested
  void CommandLineFlagConstraintList::init(void) {
--- 218,228 ----
  
  // Generate func argument to pass into emit_constraint_xxx functions
  #define EMIT_CONSTRAINT_CHECK(func, type)                               , func, CommandLineFlagConstraint::type
  
  // the "name" argument must be a string literal
! #define INITIAL_CONSTRAINTS_SIZE 16
  GrowableArray<CommandLineFlagConstraint*>* CommandLineFlagConstraintList::_constraints = NULL;
  CommandLineFlagConstraint::ConstraintType CommandLineFlagConstraintList::_validating_type = CommandLineFlagConstraint::AtParse;
  
  // Check the ranges of all flags that have them or print them out and exit if requested
  void CommandLineFlagConstraintList::init(void) {
*** 272,282 ****
                                     EMIT_CONSTRAINT_NOTPRODUCT_FLAG,
                                     IGNORE_RANGE,
                                     EMIT_CONSTRAINT_CHECK));
  #endif // COMPILER2
  
! #if INCLUDE_ALL_GCS
    emit_constraint_no(NULL G1_FLAGS(EMIT_CONSTRAINT_DEVELOPER_FLAG,
                                     EMIT_CONSTRAINT_PD_DEVELOPER_FLAG,
                                     EMIT_CONSTRAINT_PRODUCT_FLAG,
                                     EMIT_CONSTRAINT_PD_PRODUCT_FLAG,
                                     EMIT_CONSTRAINT_DIAGNOSTIC_FLAG,
--- 272,282 ----
                                     EMIT_CONSTRAINT_NOTPRODUCT_FLAG,
                                     IGNORE_RANGE,
                                     EMIT_CONSTRAINT_CHECK));
  #endif // COMPILER2
  
! #ifndef INCLUDE_ALL_GCS
    emit_constraint_no(NULL G1_FLAGS(EMIT_CONSTRAINT_DEVELOPER_FLAG,
                                     EMIT_CONSTRAINT_PD_DEVELOPER_FLAG,
                                     EMIT_CONSTRAINT_PRODUCT_FLAG,
                                     EMIT_CONSTRAINT_PD_PRODUCT_FLAG,
                                     EMIT_CONSTRAINT_DIAGNOSTIC_FLAG,
*** 303,313 ****
    return found;
  }
  
  // Check constraints for specific constraint type.
  bool CommandLineFlagConstraintList::check_constraints(CommandLineFlagConstraint::ConstraintType type) {
!   guarantee(type > _validating_type, "Constraint check is out of order.");
    _validating_type = type;
  
    bool status = true;
    for (int i=0; i<length(); i++) {
      CommandLineFlagConstraint* constraint = at(i);
--- 303,316 ----
    return found;
  }
  
  // Check constraints for specific constraint type.
  bool CommandLineFlagConstraintList::check_constraints(CommandLineFlagConstraint::ConstraintType type) {
!   // Skip if we already checked.
!   if (type < _validating_type) {
!     return true;
!   }
    _validating_type = type;
  
    bool status = true;
    for (int i=0; i<length(); i++) {
      CommandLineFlagConstraint* constraint = at(i);