Mercurial > hg > truffle
changeset 20569:20ce707c3aba
Merge
| author | jiangli |
|---|---|
| date | Fri, 24 Oct 2014 02:41:37 +0000 |
| parents | 46140919bf90 (diff) 6b93bf9ea3ea (current diff) |
| children | 1bd99e1dc168 |
| files | |
| diffstat | 4 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Thu Oct 23 15:32:14 2014 -0700 +++ b/src/share/vm/runtime/arguments.cpp Fri Oct 24 02:41:37 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++) {
--- a/src/share/vm/runtime/arguments_ext.hpp Thu Oct 23 15:32:14 2014 -0700 +++ b/src/share/vm/runtime/arguments_ext.hpp Fri Oct 24 02:41:37 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 Thu Oct 23 15:32:14 2014 -0700 +++ b/src/share/vm/runtime/globals.cpp Fri Oct 24 02:41:37 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 {
--- a/src/share/vm/runtime/globals.hpp Thu Oct 23 15:32:14 2014 -0700 +++ b/src/share/vm/runtime/globals.hpp Fri Oct 24 02:41:37 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;