# HG changeset patch
# User jiangli
# Date 1414119839 0
# Node ID 1bd99e1dc168a5d2521e10c00a2140dddae74a79
# Parent  68dd4d2b8dc00f82f73a21b5470ffbbbd2626131# Parent  20ce707c3abaa66037fdd148f143dc271a30fe7c
Merge

diff -r 68dd4d2b8dc0 -r 1bd99e1dc168 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Thu Oct 23 15:46:59 2014 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Fri Oct 24 03:03:59 2014 +0000
@@ -3617,6 +3617,8 @@
   bool settings_file_specified = false;
   bool needs_hotspotrc_warning = false;
 
+  ArgumentsExt::process_options(args);
+
   const char* flags_file;
   int index;
   for (index = 0; index < args->nOptions; index++) {
diff -r 68dd4d2b8dc0 -r 1bd99e1dc168 src/share/vm/runtime/arguments_ext.hpp
--- a/src/share/vm/runtime/arguments_ext.hpp	Thu Oct 23 15:46:59 2014 -0700
+++ b/src/share/vm/runtime/arguments_ext.hpp	Fri Oct 24 03:03:59 2014 +0000
@@ -34,6 +34,7 @@
   static inline bool check_gc_consistency_user();
   static inline bool check_gc_consistency_ergo();
   static inline bool check_vm_args_consistency();
+  static        void process_options(const JavaVMInitArgs* args) {}
 };
 
 void ArgumentsExt::select_gc_ergonomically() {
diff -r 68dd4d2b8dc0 -r 1bd99e1dc168 src/share/vm/runtime/globals.cpp
--- a/src/share/vm/runtime/globals.cpp	Thu Oct 23 15:46:59 2014 -0700
+++ b/src/share/vm/runtime/globals.cpp	Fri Oct 24 03:03:59 2014 +0000
@@ -243,6 +243,11 @@
   return is_unlocked_ext();
 }
 
+void Flag::unlock_diagnostic() {
+  assert(is_diagnostic(), "sanity");
+  _flags = Flags(_flags & ~KIND_DIAGNOSTIC);
+}
+
 // Get custom message for this locked flag, or return NULL if
 // none is available.
 void Flag::get_locked_message(char* buf, int buflen) const {
diff -r 68dd4d2b8dc0 -r 1bd99e1dc168 src/share/vm/runtime/globals.hpp
--- a/src/share/vm/runtime/globals.hpp	Thu Oct 23 15:46:59 2014 -0700
+++ b/src/share/vm/runtime/globals.hpp	Fri Oct 24 03:03:59 2014 +0000
@@ -313,6 +313,8 @@
   bool is_writeable_ext() const;
   bool is_external_ext() const;
 
+  void unlock_diagnostic();
+
   void get_locked_message(char*, int) const;
   void get_locked_message_ext(char*, int) const;