8140359: get_locked_message_ext() should return Flag::MsgType

Changed get_locked_message_ext() to return Flag::MsgType

Reviewed-by: coleenp, rehn
This commit is contained in:
Gerard Ziemski 2018-03-19 14:20:28 -05:00
parent d0391f46a9
commit 3cbe6dfd8f
3 changed files with 7 additions and 5 deletions

View File

@ -447,8 +447,7 @@ Flag::MsgType Flag::get_locked_message(char* buf, int buflen) const {
_name);
return Flag::NOTPRODUCT_FLAG_BUT_PRODUCT_BUILD;
}
get_locked_message_ext(buf, buflen);
return Flag::NONE;
return get_locked_message_ext(buf, buflen);
}
bool Flag::is_writeable() const {

View File

@ -184,7 +184,9 @@ struct Flag {
DIAGNOSTIC_FLAG_BUT_LOCKED,
EXPERIMENTAL_FLAG_BUT_LOCKED,
DEVELOPER_FLAG_BUT_PRODUCT_BUILD,
NOTPRODUCT_FLAG_BUT_PRODUCT_BUILD
NOTPRODUCT_FLAG_BUT_PRODUCT_BUILD,
COMMERCIAL_FLAG_BUT_DISABLED,
COMMERCIAL_FLAG_BUT_LOCKED
};
const char* _type;
@ -285,7 +287,7 @@ struct Flag {
void clear_diagnostic();
Flag::MsgType get_locked_message(char*, int) const;
void get_locked_message_ext(char*, int) const;
Flag::MsgType get_locked_message_ext(char*, int) const;
// printRanges will print out flags type, name and range values as expected by -XX:+PrintFlagsRanges
void print_on(outputStream* st, bool withComments = false, bool printRanges = false);

View File

@ -61,9 +61,10 @@ inline bool Flag::is_external_ext() const {
return false;
}
inline void Flag::get_locked_message_ext(char* buf, int buflen) const {
inline Flag::MsgType Flag::get_locked_message_ext(char* buf, int buflen) const {
assert(buf != NULL, "Buffer cannot be NULL");
buf[0] = '\0';
return Flag::NONE;
}
#endif // SHARE_VM_RUNTIME_GLOBALS_EXT_HPP