Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/runtime/globals.cpp	Tue Nov 29 17:00:46 2011 -0500
     1.2 +++ b/src/share/vm/runtime/globals.cpp	Wed Nov 30 12:48:52 2011 -0500
     1.3 @@ -46,8 +46,8 @@
     1.4  
     1.5  RUNTIME_FLAGS(MATERIALIZE_DEVELOPER_FLAG, MATERIALIZE_PD_DEVELOPER_FLAG, \
     1.6                MATERIALIZE_PRODUCT_FLAG, MATERIALIZE_PD_PRODUCT_FLAG, \
     1.7 -              MATERIALIZE_COMMERCIAL_FLAG, MATERIALIZE_DIAGNOSTIC_FLAG, \
     1.8 -              MATERIALIZE_EXPERIMENTAL_FLAG, MATERIALIZE_NOTPRODUCT_FLAG, \
     1.9 +              MATERIALIZE_DIAGNOSTIC_FLAG, MATERIALIZE_EXPERIMENTAL_FLAG, \
    1.10 +              MATERIALIZE_NOTPRODUCT_FLAG, \
    1.11                MATERIALIZE_MANAGEABLE_FLAG, MATERIALIZE_PRODUCT_RW_FLAG, \
    1.12                MATERIALIZE_LP64_PRODUCT_FLAG)
    1.13  
    1.14 @@ -56,16 +56,13 @@
    1.15                   MATERIALIZE_DIAGNOSTIC_FLAG, MATERIALIZE_NOTPRODUCT_FLAG)
    1.16  
    1.17  bool Flag::is_unlocker() const {
    1.18 -  return strcmp(name, "UnlockCommercialVMOptions") == 0     ||
    1.19 -         strcmp(name, "UnlockDiagnosticVMOptions") == 0     ||
    1.20 +  return strcmp(name, "UnlockDiagnosticVMOptions") == 0     ||
    1.21           strcmp(name, "UnlockExperimentalVMOptions") == 0;
    1.22  
    1.23  }
    1.24  
    1.25  bool Flag::is_unlocked() const {
    1.26 -  if (strcmp(kind, "{commercial}") == 0) {
    1.27 -    return UnlockCommercialVMOptions;
    1.28 -  } else if (strcmp(kind, "{diagnostic}") == 0) {
    1.29 +  if (strcmp(kind, "{diagnostic}") == 0) {
    1.30      if (strcmp(name, "EnableInvokeDynamic") == 0 && UnlockExperimentalVMOptions && !UnlockDiagnosticVMOptions) {
    1.31        // transitional logic to allow tests to run until they are changed
    1.32        static int warned;
    1.33 @@ -168,7 +165,6 @@
    1.34  
    1.35  #define RUNTIME_PRODUCT_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{product}", DEFAULT },
    1.36  #define RUNTIME_PD_PRODUCT_FLAG_STRUCT(type, name, doc)     { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{pd product}", DEFAULT },
    1.37 -#define RUNTIME_COMMERCIAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{commercial}", DEFAULT },
    1.38  #define RUNTIME_DIAGNOSTIC_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{diagnostic}", DEFAULT },
    1.39  #define RUNTIME_EXPERIMENTAL_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{experimental}", DEFAULT },
    1.40  #define RUNTIME_MANAGEABLE_FLAG_STRUCT(type, name, value, doc) { #type, XSTR(name), &name, NOT_PRODUCT_ARG(doc) "{manageable}", DEFAULT },
    1.41 @@ -231,7 +227,7 @@
    1.42  #endif
    1.43  
    1.44  static Flag flagTable[] = {
    1.45 - RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_COMMERCIAL_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_EXPERIMENTAL_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT, RUNTIME_MANAGEABLE_FLAG_STRUCT, RUNTIME_PRODUCT_RW_FLAG_STRUCT, RUNTIME_LP64_PRODUCT_FLAG_STRUCT)
    1.46 + RUNTIME_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_EXPERIMENTAL_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT, RUNTIME_MANAGEABLE_FLAG_STRUCT, RUNTIME_PRODUCT_RW_FLAG_STRUCT, RUNTIME_LP64_PRODUCT_FLAG_STRUCT)
    1.47   RUNTIME_OS_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT)
    1.48  #ifndef SERIALGC
    1.49   G1_FLAGS(RUNTIME_DEVELOP_FLAG_STRUCT, RUNTIME_PD_DEVELOP_FLAG_STRUCT, RUNTIME_PRODUCT_FLAG_STRUCT, RUNTIME_PD_PRODUCT_FLAG_STRUCT, RUNTIME_DIAGNOSTIC_FLAG_STRUCT, RUNTIME_EXPERIMENTAL_FLAG_STRUCT, RUNTIME_NOTPRODUCT_FLAG_STRUCT, RUNTIME_MANAGEABLE_FLAG_STRUCT, RUNTIME_PRODUCT_RW_FLAG_STRUCT)
    1.50 @@ -261,8 +257,8 @@
    1.51    for (Flag* current = &flagTable[0]; current->name; current++) {
    1.52      if (str_equal(current->name, name, length)) {
    1.53        if (!(current->is_unlocked() || current->is_unlocker())) {
    1.54 -        // disable use of commercial, diagnostic or experimental
    1.55 -        // flags until they are explicitly unlocked
    1.56 +        // disable use of diagnostic or experimental flags until they
    1.57 +        // are explicitly unlocked
    1.58          return NULL;
    1.59        }
    1.60        return current;