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

8259475: Fix bad merge in compilerOracle

Browse Source 
Reviewed-by: redestad, thartmann
This commit is contained in:
Aleksey Shipilev 2021-01-11 07:32:27 +00:00
parent b72de3c5fc
commit 2806bf2e73
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/hotspot/share/compiler/compilerOracle.cpp
View File

@ -410,19 +410,6 @@ bool CompilerOracle::should_break_at(const methodHandle& method) {
return check_predicate(CompileCommand::Break, method); return check_predicate(CompileCommand::Break, method);
} }
bool CompilerOracle::should_blackhole(const methodHandle& method) {
if (!check_predicate(CompileCommand::Blackhole, method)) {
return false;
}
guarantee(UnlockDiagnosticVMOptions, "Checked during initial parsing");
if (method->result_type() != T_VOID) {
warning("Blackhole compile option only works for methods with void type: %s",
method->name_and_sig_as_C_string());
return false;
}
return true;
}
static enum CompileCommand match_option_name(const char* line, int* bytes_read, char* errorbuf, int bufsize) { static enum CompileCommand match_option_name(const char* line, int* bytes_read, char* errorbuf, int bufsize) {
assert(ARRAY_SIZE(option_names) == static_cast<int>(CompileCommand::Count), "option_names size mismatch"); assert(ARRAY_SIZE(option_names) == static_cast<int>(CompileCommand::Count), "option_names size mismatch");

4
src/hotspot/share/compiler/compilerOracle.hpp
View File

@ -51,7 +51,6 @@ class methodHandle;
option(Print, "print", Bool) \ option(Print, "print", Bool) \
option(Inline, "inline", Bool) \ option(Inline, "inline", Bool) \
option(DontInline, "dontinline", Bool) \ option(DontInline, "dontinline", Bool) \
option(Blackhole, "blackhole", Bool) \
option(CompileOnly, "compileonly", Bool)\ option(CompileOnly, "compileonly", Bool)\
option(Exclude, "exclude", Bool) \ option(Exclude, "exclude", Bool) \
option(Break, "break", Bool) \ option(Break, "break", Bool) \
@ -142,9 +141,6 @@ class CompilerOracle : AllStatic {
// Tells whether to break when compiling method // Tells whether to break when compiling method
static bool should_break_at(const methodHandle& method); static bool should_break_at(const methodHandle& method);
// Tells whether to blackhole when compiling method
static bool should_blackhole(const methodHandle& method);
// Tells whether there are any methods to print for print_method_statistics() // Tells whether there are any methods to print for print_method_statistics()
static bool should_print_methods(); static bool should_print_methods();