stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8310316: Failing HotSpot Compiler directives are too verbose

Browse Source 
Reviewed-by: thartmann, chagedorn
This commit is contained in:
Eric Nothum 2023-07-24 09:17:09 +00:00 committed by Tobias Hartmann
parent f3ade388da
commit 04f39e1f1e
3 changed files with 10 additions and 10 deletions

12
src/hotspot/share/compiler/directivesParser.cpp

@ -57,8 +57,8 @@ void DirectivesParser::clean_tmp() {
assert(_tmp_depth == 0, "Consistency");
}
int DirectivesParser::parse_string(const char* text, outputStream* st) {
DirectivesParser cd(text, st, false);
int DirectivesParser::parse_string(const char* text, outputStream* st, bool silent) {
DirectivesParser cd(text, st, silent);
if (cd.valid()) {
return cd.install_directives();
} else {
@ -77,16 +77,16 @@ bool DirectivesParser::parse_from_flag() {
return parse_from_file(CompilerDirectivesFile, tty);
}
bool DirectivesParser::parse_from_file(const char* filename, outputStream* st) {
bool DirectivesParser::parse_from_file(const char* filename, outputStream* st, bool silent) {
assert(filename != nullptr, "Test before calling this");
if (!parse_from_file_inner(filename, st)) {
if (!parse_from_file_inner(filename, st, silent)) {
st->print_cr("Could not load file: %s", filename);
return false;
}
return true;
}
bool DirectivesParser::parse_from_file_inner(const char* filename, outputStream* stream) {
bool DirectivesParser::parse_from_file_inner(const char* filename, outputStream* stream, bool silent) {
struct stat st;
ResourceMark rm;
if (os::stat(filename, &st) == 0) {
@ -99,7 +99,7 @@ bool DirectivesParser::parse_from_file_inner(const char* filename, outputStream*
::close(file_handle);
if (num_read >= 0) {
buffer[num_read] = '\0';
return parse_string(buffer, stream) > 0;
return parse_string(buffer, stream, silent) > 0;
}
}
}

6
src/hotspot/share/compiler/directivesParser.hpp

@ -55,8 +55,8 @@ class DirectivesParser : public JSON {
public:
static bool has_file();
static bool parse_from_flag();
static bool parse_from_file(const char* filename, outputStream* st);
static int parse_string(const char* string, outputStream* st);
static bool parse_from_file(const char* filename, outputStream* st, bool silent = false);
static int parse_string(const char* string, outputStream* st, bool silent = false);
int install_directives();
private:
@ -64,7 +64,7 @@ class DirectivesParser : public JSON {
~DirectivesParser();
bool callback(JSON_TYPE t, JSON_VAL* v, uint level);
static bool parse_from_file_inner(const char* filename, outputStream* st);
static bool parse_from_file_inner(const char* filename, outputStream* st, bool silent = false);
// types of "keys". i.e recognized <key>:<value> pairs in our JSON syntax
typedef enum {

2
src/hotspot/share/services/diagnosticCommand.cpp

@ -889,7 +889,7 @@ CompilerDirectivesAddDCmd::CompilerDirectivesAddDCmd(outputStream* output, bool
}
void CompilerDirectivesAddDCmd::execute(DCmdSource source, TRAPS) {
DirectivesParser::parse_from_file(_filename.value(), output());
DirectivesParser::parse_from_file(_filename.value(), output(), true);
}
void CompilerDirectivesRemoveDCmd::execute(DCmdSource source, TRAPS) {