*** old/src/share/vm/opto/c2_globals.hpp	Sat Jun 13 09:00:26 2015
--- new/src/share/vm/opto/c2_globals.hpp	Sat Jun 13 09:00:26 2015

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 59,69 ****
--- 59,69 ----
  
  //
  // Defines all globals flags used by the server compiler.
  //
  
! #define C2_FLAGS(develop, develop_pd, product, product_pd, diagnostic, experimental, notproduct, range, constraint) \
                                                                              \
    develop(bool, StressLCM, false,                                           \
            "Randomize instruction scheduling in LCM")                        \
                                                                              \
    develop(bool, StressGCM, false,                                           \

*** 92,102 ****
--- 92,103 ----
    product_pd(intx, InteriorEntryAlignment,                                  \
            "Code alignment for interior entry points "                       \
            "in generated code (in bytes)")                                   \
                                                                              \
    product(intx, MaxLoopPad, (OptoLoopAlignment-1),                          \
!           "Align a loop if padding size in bytes is less or equal to this value") \
+           "value")                                                          \
                                                                              \
    product(intx, MaxVectorSize, 64,                                          \
            "Max vector size in bytes, "                                      \
            "actual size could be less depending on elements type")           \
                                                                              \

*** 106,115 ****
--- 107,117 ----
    product(intx, NumberOfLoopInstrToAlign, 4,                                \
            "Number of first instructions in a loop to align")                \
                                                                              \
    notproduct(intx, IndexSetWatch, 0,                                        \
            "Trace all operations on this IndexSet (-1 means all, 0 none)")   \
+           range(-1, 0)                                                      \
                                                                              \
    develop(intx, OptoNodeListSize, 4,                                        \
            "Starting allocation size of Node_List data structures")          \
                                                                              \
    develop(intx, OptoBlockListSize, 8,                                       \

*** 359,368 ****
--- 361,371 ----
    develop(intx, PrintIdealGraphLevel, 0,                                    \
            "Level of detail of the ideal graph printout. "                   \
            "System-wide value, 0=nothing is printed, 3=all details printed. "\
            "Level of detail of printouts can be set on a per-method level "  \
            "as well by using CompileCommand=option.")                        \
+           range(0, 3)                                                       \
                                                                              \
    develop(intx, PrintIdealGraphPort, 4444,                                  \
            "Ideal graph printer to network port")                            \
                                                                              \
    notproduct(ccstr, PrintIdealGraphAddress, "127.0.0.1",                    \

*** 380,396 ****
--- 383,402 ----
                                                                              \
    product(bool, InsertMemBarAfterArraycopy, true,                           \
            "Insert memory barrier after arraycopy call")                     \
                                                                              \
    develop(bool, SubsumeLoads, true,                                         \
!           "Attempt to compile while subsuming loads into machine instructions.") \
!           "Attempt to compile while subsuming loads into machine "          \
+           "instructions.")                                                  \
                                                                              \
    develop(bool, StressRecompilation, false,                                 \
!           "Recompile each compiled method without subsuming loads or escape analysis.") \
!           "Recompile each compiled method without subsuming loads "         \
+           "or escape analysis.")                                            \
                                                                              \
    develop(intx, ImplicitNullCheckThreshold, 3,                              \
!           "Don't do implicit null checks if NPE's in a method exceeds limit") \
!           "Don't do implicit null checks if NPE's in a method exceeds "     \
+           "limit")                                                          \
                                                                              \
    product(intx, LoopOptsCount, 43,                                          \
            "Set level of loop optimization for tier 1 compiles")             \
                                                                              \
    /* controls for heat-based inlining */                                    \

*** 532,550 ****
--- 538,557 ----
                                                                              \
    product(bool, BlockLayoutByFrequency, true,                               \
            "Use edge frequencies to drive block ordering")                   \
                                                                              \
    product(intx, BlockLayoutMinDiamondPercentage, 20,                        \
!           "Miniumum %% of a successor (predecessor) for which block layout "\
!           "a will allow a fork (join) in a single chain")                   \
!           "Miniumum %% of a successor (predecessor) for which block "       \
!           "layout a will allow a fork (join) in a single chain")            \
+           range(0, 100)                                                     \
                                                                              \
    product(bool, BlockLayoutRotateLoops, true,                               \
            "Allow back branches to be fall throughs in the block layour")    \
                                                                              \
    develop(bool, InlineReflectionGetCallerClass, true,                       \
!           "inline sun.reflect.Reflection.getCallerClass(), known to be part "\
!           "of base library DLL")                                            \
!           "inline sun.reflect.Reflection.getCallerClass(), known to be "    \
!           "part of base library DLL")                                       \
                                                                              \
    develop(bool, InlineObjectCopy, true,                                     \
            "inline Object.clone and Arrays.copyOf[Range] intrinsics")        \
                                                                              \
    develop(bool, SpecialStringCompareTo, true,                               \

*** 602,611 ****
--- 609,619 ----
    develop(bool, InlineAccessors, true,                                      \
            "inline accessor methods (get/set)")                              \
                                                                              \
    product(intx, TypeProfileMajorReceiverPercent, 90,                        \
            "% of major receiver type to all profiled receivers")             \
+           range(0, 100)                                                     \
                                                                              \
    diagnostic(bool, PrintIntrinsics, false,                                  \
            "prints attempted and successful inlining of intrinsics")         \
                                                                              \
    diagnostic(ccstrlist, DisableIntrinsic, "",                               \

*** 641,650 ****
--- 649,660 ----
            "Scaling factor for branch frequencies (deprecated)")             \
                                                                              \
    product(intx, AliasLevel,     3,                                          \
            "0 for no aliasing, 1 for oop/field/static/array split, "         \
            "2 for class split, 3 for unique instances")                      \
+           range(0, 3)                                                       \
+           constraint(AliasLevelConstraintFunc)                              \
                                                                              \
    develop(bool, VerifyAliases, false,                                       \
            "perform extra checks on the results of alias analysis")          \
                                                                              \
    product(bool, IncrementalInline, true,                                    \

*** 681,688 ****
--- 691,706 ----
            "loads/stores")                                                   \
                                                                              \
    develop(bool, StressArrayCopyMacroNode, false,                            \
            "Perform ArrayCopy load/store replacement during IGVN only")
  
! C2_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG)
! C2_FLAGS(DECLARE_DEVELOPER_FLAG, \
+          DECLARE_PD_DEVELOPER_FLAG, \
+          DECLARE_PRODUCT_FLAG, \
+          DECLARE_PD_PRODUCT_FLAG, \
+          DECLARE_DIAGNOSTIC_FLAG, \
+          DECLARE_EXPERIMENTAL_FLAG, \
+          DECLARE_NOTPRODUCT_FLAG, \
+          IGNORE_RANGE, \
+          IGNORE_CONSTRAINT)
  
  #endif // SHARE_VM_OPTO_C2_GLOBALS_HPP