*** old/src/hotspot/share/runtime/globals_extension.hpp	Thu Mar 29 13:44:16 2018
--- new/src/hotspot/share/runtime/globals_extension.hpp	Thu Mar 29 13:44:15 2018

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2003, 2018, 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.

*** 179,191 ****
--- 179,191 ----
              ARCH_EXPERIMENTAL_FLAG_MEMBER, \
              ARCH_NOTPRODUCT_FLAG_MEMBER, \
              IGNORE_RANGE, \
              IGNORE_CONSTRAINT, \
              IGNORE_WRITEABLE)
   COMMANDLINEFLAG_EXT
!  NUM_CommandLineFlag
! } CommandLineFlag;
+  JVMFLAGS_EXT
!  NUM_JVMFlags
! } JVMFlags;
  
  // Construct enum of Flag_<cmdline-arg>_<type> constants.
  
  #define FLAG_MEMBER_WITH_TYPE(flag,type) Flag_##flag##_##type
  

*** 322,369 ****
--- 322,369 ----
            ARCH_EXPERIMENTAL_FLAG_MEMBER_WITH_TYPE,
            ARCH_NOTPRODUCT_FLAG_MEMBER_WITH_TYPE,
            IGNORE_RANGE,
            IGNORE_CONSTRAINT,
            IGNORE_WRITEABLE)
   COMMANDLINEFLAGWITHTYPE_EXT
!  NUM_CommandLineFlagWithType
! } CommandLineFlagWithType;
  
! #define FLAG_IS_DEFAULT(name)         (CommandLineFlagsEx::is_default(FLAG_MEMBER(name)))
! #define FLAG_IS_ERGO(name)            (CommandLineFlagsEx::is_ergo(FLAG_MEMBER(name)))
! #define FLAG_IS_CMDLINE(name)         (CommandLineFlagsEx::is_cmdline(FLAG_MEMBER(name)))
+  JVMFLAGSWITHTYPE_EXT
!  NUM_JVMFlagsWithType
! } JVMFlagsWithType;
+ 
! #define FLAG_IS_DEFAULT(name)         (JVMFlagEx::is_default(FLAG_MEMBER(name)))
! #define FLAG_IS_ERGO(name)            (JVMFlagEx::is_ergo(FLAG_MEMBER(name)))
! #define FLAG_IS_CMDLINE(name)         (JVMFlagEx::is_cmdline(FLAG_MEMBER(name)))
  
  #define FLAG_SET_DEFAULT(name, value) ((name) = (value))
  
! #define FLAG_SET_CMDLINE(type, name, value) (CommandLineFlagsEx::setOnCmdLine(FLAG_MEMBER_WITH_TYPE(name, type)), \
!                                              CommandLineFlagsEx::type##AtPut(FLAG_MEMBER_WITH_TYPE(name, type), (type)(value), Flag::COMMAND_LINE))
! #define FLAG_SET_ERGO(type, name, value)    (CommandLineFlagsEx::type##AtPut(FLAG_MEMBER_WITH_TYPE(name, type), (type)(value), Flag::ERGONOMIC))
! #define FLAG_SET_CMDLINE(type, name, value) (JVMFlagEx::setOnCmdLine(FLAG_MEMBER_WITH_TYPE(name, type)), \
!                                              JVMFlagEx::type##AtPut(FLAG_MEMBER_WITH_TYPE(name, type), (type)(value), JVMFlag::COMMAND_LINE))
! #define FLAG_SET_ERGO(type, name, value)    (JVMFlagEx::type##AtPut(FLAG_MEMBER_WITH_TYPE(name, type), (type)(value), JVMFlag::ERGONOMIC))
  #define FLAG_SET_ERGO_IF_DEFAULT(type, name, value) \
    do {                                              \
      if (FLAG_IS_DEFAULT(name)) {                    \
        FLAG_SET_ERGO(type, name, value);             \
      }                                               \
    } while (0)
  
! // Can't put the following in CommandLineFlags because
! // Can't put the following in JVMFlag because
  // of a circular dependency on the enum definition.
! class CommandLineFlagsEx : CommandLineFlags {
! class JVMFlagEx : JVMFlag {
   public:
!   static Flag::Error boolAtPut(CommandLineFlagWithType flag, bool value, Flag::Flags origin);
!   static Flag::Error intAtPut(CommandLineFlagWithType flag, int value, Flag::Flags origin);
!   static Flag::Error uintAtPut(CommandLineFlagWithType flag, uint value, Flag::Flags origin);
!   static Flag::Error intxAtPut(CommandLineFlagWithType flag, intx value, Flag::Flags origin);
!   static Flag::Error uintxAtPut(CommandLineFlagWithType flag, uintx value, Flag::Flags origin);
!   static Flag::Error uint64_tAtPut(CommandLineFlagWithType flag, uint64_t value, Flag::Flags origin);
!   static Flag::Error size_tAtPut(CommandLineFlagWithType flag, size_t value, Flag::Flags origin);
!   static Flag::Error doubleAtPut(CommandLineFlagWithType flag, double value, Flag::Flags origin);
!   static JVMFlag::Error boolAtPut(JVMFlagsWithType flag, bool value, JVMFlag::Flags origin);
!   static JVMFlag::Error intAtPut(JVMFlagsWithType flag, int value, JVMFlag::Flags origin);
!   static JVMFlag::Error uintAtPut(JVMFlagsWithType flag, uint value, JVMFlag::Flags origin);
!   static JVMFlag::Error intxAtPut(JVMFlagsWithType flag, intx value, JVMFlag::Flags origin);
!   static JVMFlag::Error uintxAtPut(JVMFlagsWithType flag, uintx value, JVMFlag::Flags origin);
!   static JVMFlag::Error uint64_tAtPut(JVMFlagsWithType flag, uint64_t value, JVMFlag::Flags origin);
!   static JVMFlag::Error size_tAtPut(JVMFlagsWithType flag, size_t value, JVMFlag::Flags origin);
!   static JVMFlag::Error doubleAtPut(JVMFlagsWithType flag, double value, JVMFlag::Flags origin);
    // Contract:  Flag will make private copy of the incoming value
!   static Flag::Error ccstrAtPut(CommandLineFlagWithType flag, ccstr value, Flag::Flags origin);
!   static JVMFlag::Error ccstrAtPut(JVMFlagsWithType flag, ccstr value, JVMFlag::Flags origin);
  
!   static bool is_default(CommandLineFlag flag);
!   static bool is_ergo(CommandLineFlag flag);
!   static bool is_cmdline(CommandLineFlag flag);
!   static bool is_default(JVMFlags flag);
!   static bool is_ergo(JVMFlags flag);
!   static bool is_cmdline(JVMFlags flag);
  
!   static void setOnCmdLine(CommandLineFlagWithType flag);
!   static void setOnCmdLine(JVMFlagsWithType flag);
  };
  
  #endif // SHARE_VM_RUNTIME_GLOBALS_EXTENSION_HPP