Skip to content

Commit 8ec3197

Browse files
TheShermanTankerTobiHartmann
authored andcommitted
8291002: Rename Method::build_interpreter_method_data to Method::build_profiling_method_data
Reviewed-by: kvn, thartmann
1 parent 61e072d commit 8ec3197

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

src/hotspot/share/c1/c1_Runtime1.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1415,7 +1415,7 @@ JRT_ENTRY(void, Runtime1::predicate_failed_trap(JavaThread* current))
14151415
if (mdo == NULL && !HAS_PENDING_EXCEPTION) {
14161416
// Build an MDO. Ignore errors like OutOfMemory;
14171417
// that simply means we won't have an MDO to update.
1418-
Method::build_interpreter_method_data(m, THREAD);
1418+
Method::build_profiling_method_data(m, THREAD);
14191419
if (HAS_PENDING_EXCEPTION) {
14201420
// Only metaspace OOM is expected. No Java code executed.
14211421
assert((PENDING_EXCEPTION->is_a(vmClasses::OutOfMemoryError_klass())), "we expect only an OOM error here");

src/hotspot/share/ci/ciMethod.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -985,7 +985,7 @@ bool ciMethod::ensure_method_data(const methodHandle& h_m) {
985985
return true;
986986
}
987987
if (h_m()->method_data() == NULL) {
988-
Method::build_interpreter_method_data(h_m, THREAD);
988+
Method::build_profiling_method_data(h_m, THREAD);
989989
if (HAS_PENDING_EXCEPTION) {
990990
CLEAR_PENDING_EXCEPTION;
991991
}

src/hotspot/share/ci/ciReplay.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ class CompileReplay : public StackObj {
834834
// method to be rewritten (number of arguments at a call for
835835
// instance)
836836
method->method_holder()->link_class(CHECK);
837-
// Method::build_interpreter_method_data(method, CHECK);
837+
// Method::build_profiling_method_data(method, CHECK);
838838
{
839839
// Grab a lock here to prevent multiple
840840
// MethodData*s from being created.

src/hotspot/share/compiler/compilationPolicy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -950,7 +950,7 @@ void CompilationPolicy::create_mdo(const methodHandle& mh, JavaThread* THREAD) {
950950
return;
951951
}
952952
if (mh->method_data() == NULL) {
953-
Method::build_interpreter_method_data(mh, CHECK_AND_CLEAR);
953+
Method::build_profiling_method_data(mh, CHECK_AND_CLEAR);
954954
}
955955
if (ProfileInterpreter) {
956956
MethodData* mdo = mh->method_data();

src/hotspot/share/interpreter/interpreterRuntime.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ void InterpreterRuntime::note_trap_inner(JavaThread* current, int reason,
317317
if (trap_mdo == NULL) {
318318
ExceptionMark em(current);
319319
JavaThread* THREAD = current; // For exception macros.
320-
Method::build_interpreter_method_data(trap_method, THREAD);
320+
Method::build_profiling_method_data(trap_method, THREAD);
321321
if (HAS_PENDING_EXCEPTION) {
322322
// Only metaspace OOM is expected. No Java code executed.
323323
assert((PENDING_EXCEPTION->is_a(vmClasses::OutOfMemoryError_klass())),

src/hotspot/share/oops/method.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -574,9 +574,9 @@ void Method::print_invocation_count() {
574574
#endif
575575
}
576576

577-
// Build a MethodData* object to hold information about this method
578-
// collected in the interpreter.
579-
void Method::build_interpreter_method_data(const methodHandle& method, TRAPS) {
577+
// Build a MethodData* object to hold profiling information collected on this
578+
// method when requested.
579+
void Method::build_profiling_method_data(const methodHandle& method, TRAPS) {
580580
// Do not profile the method if metaspace has hit an OOM previously
581581
// allocating profiling data. Callers clear pending exception so don't
582582
// add one here.
@@ -599,7 +599,7 @@ void Method::build_interpreter_method_data(const methodHandle& method, TRAPS) {
599599
method->set_method_data(method_data);
600600
if (PrintMethodData && (Verbose || WizardMode)) {
601601
ResourceMark rm(THREAD);
602-
tty->print("build_interpreter_method_data for ");
602+
tty->print("build_profiling_method_data for ");
603603
method->print_name(tty);
604604
tty->cr();
605605
// At the end of the run, the MDO, full of data, will be dumped.

src/hotspot/share/oops/method.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ class Method : public Metadata {
419419
bool was_executed_more_than(int n);
420420
bool was_never_executed() { return !was_executed_more_than(0); }
421421

422-
static void build_interpreter_method_data(const methodHandle& method, TRAPS);
422+
static void build_profiling_method_data(const methodHandle& method, TRAPS);
423423

424424
static MethodCounters* build_method_counters(Thread* current, Method* m);
425425

src/hotspot/share/prims/whitebox.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1170,7 +1170,7 @@ WB_ENTRY(void, WB_MarkMethodProfiled(JNIEnv* env, jobject o, jobject method))
11701170

11711171
MethodData* mdo = mh->method_data();
11721172
if (mdo == NULL) {
1173-
Method::build_interpreter_method_data(mh, CHECK_AND_CLEAR);
1173+
Method::build_profiling_method_data(mh, CHECK_AND_CLEAR);
11741174
mdo = mh->method_data();
11751175
}
11761176
mdo->init();

src/hotspot/share/runtime/deoptimization.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1729,7 +1729,7 @@ Deoptimization::get_method_data(JavaThread* thread, const methodHandle& m,
17291729
if (mdo == NULL && create_if_missing && !HAS_PENDING_EXCEPTION) {
17301730
// Build an MDO. Ignore errors like OutOfMemory;
17311731
// that simply means we won't have an MDO to update.
1732-
Method::build_interpreter_method_data(m, THREAD);
1732+
Method::build_profiling_method_data(m, THREAD);
17331733
if (HAS_PENDING_EXCEPTION) {
17341734
// Only metaspace OOM is expected. No Java code executed.
17351735
assert((PENDING_EXCEPTION->is_a(vmClasses::OutOfMemoryError_klass())), "we expect only an OOM error here");

0 commit comments

Comments
 (0)