relax flag attributions (ala JDK-7123237)

Author: iklam

src/hotspot/share/runtime/arguments.cpp

@@ -3782,7 +3782,6 @@ static void apply_debugger_ergo() {
 
 jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
   assert(verify_special_jvm_flags(false), "deprecated and obsolete flag table inconsistent");
-  JVMFlag::check_all_flag_declarations();
 
   // If flag "-XX:Flags=flags-file" is used it will be the first option to be processed.
   const char* hotspotrc = ".hotspotrc";

src/hotspot/share/runtime/flags/debug_globals.hpp

@@ -38,19 +38,6 @@
 // just in case someone may add such a flag in the future.
 //
 
-#ifndef ASSERT
-
-#define DEBUG_RUNTIME_FLAGS(develop,                                        \
-                            develop_pd,                                     \
-                            product,                                        \
-                            product_pd,                                     \
-                            notproduct,                                     \
-                            range,                                          \
-                            constraint)                                     \
-                                                                            \
-
-#else
-
 #define DEBUG_RUNTIME_FLAGS(develop,                                        \
                             develop_pd,                                     \
                             product,                                        \
@@ -59,14 +46,12 @@
                             range,                                          \
                             constraint)                                     \
                                                                             \
-  product(ccstr, DummyManageableStringFlag, NULL, MANAGEABLE,               \
+  notproduct(ccstr, DummyManageableStringFlag, NULL, MANAGEABLE,            \
           "Dummy flag for testing string handling in WriteableFlags")       \
                                                                             \
 
 // end of DEBUG_RUNTIME_FLAGS
 
-#endif // ASSERT
-
 DECLARE_FLAGS(DEBUG_RUNTIME_FLAGS)
 
 #endif // SHARE_RUNTIME_DEBUG_GLOBALS_HPP

src/hotspot/share/runtime/flags/jvmFlag.cpp

@@ -681,25 +681,6 @@ void JVMFlag::assert_valid_flag_enum(JVMFlagsEnum i) {
   assert(0 <= int(i) && int(i) < NUM_JVMFlagsEnum, "must be");
 }
 
-void JVMFlag::check_all_flag_declarations() {
-  for (JVMFlag* current = &flagTable[0]; current->_name != NULL; current++) {
-    int flags = static_cast<int>(current->_flags);
-    // Backwards compatibility. This will be relaxed/removed in JDK-7123237.
-    int mask = JVMFlag::KIND_DIAGNOSTIC | JVMFlag::KIND_MANAGEABLE | JVMFlag::KIND_EXPERIMENTAL;
-    if ((flags & mask) != 0) {
-      assert((flags & mask) == JVMFlag::KIND_DIAGNOSTIC ||
-             (flags & mask) == JVMFlag::KIND_MANAGEABLE ||
-             (flags & mask) == JVMFlag::KIND_EXPERIMENTAL,
-             "%s can be declared with at most one of "
-             "DIAGNOSTIC, MANAGEABLE or EXPERIMENTAL", current->_name);
-      assert((flags & KIND_NOT_PRODUCT) == 0 &&
-             (flags & KIND_DEVELOP) == 0,
-             "%s has an optional DIAGNOSTIC, MANAGEABLE or EXPERIMENTAL "
-             "attribute; it must be declared as a product flag", current->_name);
-    }
-  }
-}
-
 #endif // ASSERT
 
 void JVMFlag::printFlags(outputStream* out, bool withComments, bool printRanges, bool skipDefaults) {

src/hotspot/share/runtime/flags/jvmFlag.hpp

@@ -179,7 +179,6 @@ class JVMFlag {
   static JVMFlag* fuzzy_match(const char* name, size_t length, bool allow_locked = false);
 
   static void assert_valid_flag_enum(JVMFlagsEnum i) NOT_DEBUG_RETURN;
-  static void check_all_flag_declarations() NOT_DEBUG_RETURN;
 
   inline JVMFlagsEnum flag_enum() const {
     JVMFlagsEnum i = static_cast<JVMFlagsEnum>(this - JVMFlag::flags);