Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
8259475: Fix bad merge in compilerOracle
Reviewed-by: redestad, thartmann
  • Loading branch information
shipilev committed Jan 11, 2021
1 parent b72de3c commit 2806bf2e7362f5442a1e959e68bed00c240319e3
Showing with 0 additions and 17 deletions.
  1. +0 −13 src/hotspot/share/compiler/compilerOracle.cpp
  2. +0 −4 src/hotspot/share/compiler/compilerOracle.hpp
@@ -410,19 +410,6 @@ bool CompilerOracle::should_break_at(const methodHandle& 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) {
assert(ARRAY_SIZE(option_names) == static_cast<int>(CompileCommand::Count), "option_names size mismatch");

@@ -51,7 +51,6 @@ class methodHandle;
option(Print, "print", Bool) \
option(Inline, "inline", Bool) \
option(DontInline, "dontinline", Bool) \
option(Blackhole, "blackhole", Bool) \
option(CompileOnly, "compileonly", Bool)\
option(Exclude, "exclude", Bool) \
option(Break, "break", Bool) \
@@ -142,9 +141,6 @@ class CompilerOracle : AllStatic {
// Tells whether to break when compiling 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()
static bool should_print_methods();

0 comments on commit 2806bf2

Please sign in to comment.