*** old/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp	Fri Aug  7 10:29:22 2015
--- new/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp	Fri Aug  7 10:29:22 2015

*** 23,43 ****
--- 23,42 ----
   */
  
  #include "precompiled.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/commandLineFlagConstraintsCompiler.hpp"
+ #include "runtime/commandLineFlagRangeList.hpp"
  #include "runtime/globals.hpp"
  #include "utilities/defaultStream.hpp"
  
! Flag::Error AliasLevelConstraintFunc(bool verbose, intx* value) {
-   if ((*value <= 1) && (Arguments::mode() == Arguments::_comp)) {
      if (verbose == true) {
        jio_fprintf(defaultStream::error_stream(),
                  "AliasLevel (" INTX_FORMAT ") is not compatible "
                  "with -Xcomp \n",
                  *value);
      }
! Flag::Error AliasLevelConstraintFunc(intx value, bool verbose) {
!   if ((value <= 1) && (Arguments::mode() == Arguments::_comp)) {
+     CommandLineError::print(verbose,
+                             "AliasLevel (" INTX_FORMAT ") is not "
+                             "compatible with -Xcomp \n",
+                             value);
      return Flag::VIOLATES_CONSTRAINT;
    } else {
      return Flag::SUCCESS;
    }
  }

*** 55,65 ****
--- 54,64 ----
   *    C1 can be used, so the minimum number of compiler threads is 1.
   * 4) The JVM is build using the compilers and tiered compilation is enabled. The option
   *    'TieredStopAtLevel = CompLevel_full_optimization' (the default value). As a result,
   *    the minimum number of compiler threads is 2.
   */
! Flag::Error CICompilerCountConstraintFunc(bool verbose, intx* value) {
! Flag::Error CICompilerCountConstraintFunc(intx value, bool verbose) {
    int min_number_of_compiler_threads = 0;
  #if !defined(COMPILER1) && !defined(COMPILER2) && !defined(SHARK)
    // case 1
  #else
    if (!TieredCompilation || (TieredStopAtLevel < CompLevel_full_optimization)) {

*** 70,85 ****
--- 69,83 ----
  #endif
  
    // The default CICompilerCount's value is CI_COMPILER_COUNT.
    assert(min_number_of_compiler_threads <= CI_COMPILER_COUNT, "minimum should be less or equal default number");
  
-   if (*value < (intx)min_number_of_compiler_threads) {
      if (verbose == true) {
        jio_fprintf(defaultStream::error_stream(),
!                   "CICompilerCount=" INTX_FORMAT " must be at least %d \n",
!                   *value, min_number_of_compiler_threads);
      }
+     CommandLineError::print(verbose,
+                             "CICompilerCount (" INTX_FORMAT ") must be "
!                             "at least %d \n",
!                             value, min_number_of_compiler_threads);
      return Flag::VIOLATES_CONSTRAINT;
    } else {
      return Flag::SUCCESS;
    }
  }