changeset 7297:e859b5ba6be4

Merge
author jiangli
date Tue, 14 Oct 2014 19:39:28 +0000
parents 5fc21235d0fd b2b7723ea3a1
children d13e6905c8d2
files
diffstat 4 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Tue Oct 14 10:32:12 2014 -0700
+++ b/src/share/vm/runtime/arguments.cpp	Tue Oct 14 19:39:28 2014 +0000
@@ -3739,6 +3739,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++) {
--- a/src/share/vm/runtime/arguments_ext.hpp	Tue Oct 14 10:32:12 2014 -0700
+++ b/src/share/vm/runtime/arguments_ext.hpp	Tue Oct 14 19:39:28 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() {
--- a/src/share/vm/runtime/globals.cpp	Tue Oct 14 10:32:12 2014 -0700
+++ b/src/share/vm/runtime/globals.cpp	Tue Oct 14 19:39:28 2014 +0000
@@ -256,6 +256,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 {
--- a/src/share/vm/runtime/globals.hpp	Tue Oct 14 10:32:12 2014 -0700
+++ b/src/share/vm/runtime/globals.hpp	Tue Oct 14 19:39:28 2014 +0000
@@ -320,6 +320,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;