Skip to content

8354543: Set more meaningful names for "get_vm_result" and "get_vm_result_2" #24632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

8354543: Set more meaningful names for "get_vm_result" and "get_vm_result_2" #24632

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
470ac82
Rename get_vm_result and get_vm_result_2 to more meaningfult names.
JohnTortugo Apr 9, 2025
ce19dd8
Fix merge conflicts
JohnTortugo Apr 14, 2025
1333e4a
Remove stale comments & dead code.
JohnTortugo Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3723,7 +3723,6 @@ void TemplateTable::checkcast()

__ push(atos); // save receiver for result, and for GC
call_VM(r0, CAST_FROM_FN_PTR(address, InterpreterRuntime::quicken_io_cc));
// vm_result_2 has metadata result
__ get_vm_result_metadata(r0, rthread);
__ pop(r3); // restore receiver
__ b(resolved);
Expand Down Expand Up @@ -3777,7 +3776,6 @@ void TemplateTable::instanceof() {

__ push(atos); // save receiver for result, and for GC
call_VM(r0, CAST_FROM_FN_PTR(address, InterpreterRuntime::quicken_io_cc));
// vm_result_2 has metadata result
__ get_vm_result_metadata(r0, rthread);
__ pop(r3); // restore receiver
__ verify_oop(r3);
Expand Down
2 changes: 0 additions & 2 deletions src/hotspot/cpu/arm/templateTable_arm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4143,7 +4143,6 @@ void TemplateTable::checkcast() {

__ push(atos);
call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::quicken_io_cc));
// vm_result_2 has metadata result
__ get_vm_result_metadata(Rsuper, Robj);
__ pop_ptr(Robj);
__ b(resolved);
Expand Down Expand Up @@ -4214,7 +4213,6 @@ void TemplateTable::instanceof() {

__ push(atos);
call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::quicken_io_cc));
// vm_result_2 has metadata result
__ get_vm_result_metadata(Rsuper, Robj);
__ pop_ptr(Robj);
__ b(resolved);
Expand Down
2 changes: 0 additions & 2 deletions src/hotspot/cpu/riscv/templateTable_riscv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3657,7 +3657,6 @@ void TemplateTable::checkcast() {

__ push(atos); // save receiver for result, and for GC
call_VM(x10, CAST_FROM_FN_PTR(address, InterpreterRuntime::quicken_io_cc));
// vm_result_2 has metadata result
__ get_vm_result_metadata(x10, xthread);
__ pop_reg(x13); // restore receiver
__ j(resolved);
Expand Down Expand Up @@ -3712,7 +3711,6 @@ void TemplateTable::instanceof() {

__ push(atos); // save receiver for result, and for GC
call_VM(x10, CAST_FROM_FN_PTR(address, InterpreterRuntime::quicken_io_cc));
// vm_result_2 has metadata result
__ get_vm_result_metadata(x10, xthread);
__ pop_reg(x13); // restore receiver
__ verify_oop(x13);
Expand Down
1 change: 0 additions & 1 deletion src/hotspot/cpu/x86/templateTable_x86.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3680,7 +3680,6 @@ void TemplateTable::checkcast() {
__ push(atos); // save receiver for result, and for GC
call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::quicken_io_cc));

// vm_result_2 has metadata result
__ get_vm_result_metadata(rax);

__ pop_ptr(rdx); // restore receiver
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/share/runtime/javaThread.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class JavaThread: public Thread {
Method* _callee_target;

// Used to pass back results to the interpreter or generated code running Java code.
oop _vm_result_oop; // oop result is GC-preserved
oop _vm_result_oop; // oop result is GC-preserved
Metadata* _vm_result_metadata; // non-oop result

// See ReduceInitialCardMarks: this holds the precise space interval of
Expand Down Expand Up @@ -787,7 +787,7 @@ class JavaThread: public Thread {
oop vm_result_oop() const { return _vm_result_oop; }
void set_vm_result_oop(oop x) { _vm_result_oop = x; }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
void set_vm_result_oop(oop x) { _vm_result_oop = x; }
void set_vm_result_oop(oop x) { _vm_result_oop = x; }

Copy link
Contributor

@coleenp coleenp Apr 16, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think John fixed the space here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. But whatever, I won't quibble. @JohnTortugo -- fix it if you can.


void set_vm_result_metadata(Metadata* x) { _vm_result_metadata = x; }
void set_vm_result_metadata(Metadata* x) { _vm_result_metadata = x; }

MemRegion deferred_card_mark() const { return _deferred_card_mark; }
void set_deferred_card_mark(MemRegion mr) { _deferred_card_mark = mr; }
Expand Down
4 changes: 1 addition & 3 deletions src/hotspot/share/runtime/vmStructs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,10 +604,8 @@
nonstatic_field(JavaThread, _threadObj, OopHandle) \
nonstatic_field(JavaThread, _vthread, OopHandle) \
nonstatic_field(JavaThread, _jvmti_vthread, OopHandle) \
nonstatic_field(JavaThread, _scopedValueCache, OopHandle) \
nonstatic_field(JavaThread, _scopedValueCache, OopHandle) \
nonstatic_field(JavaThread, _anchor, JavaFrameAnchor) \
nonstatic_field(JavaThread, _vm_result_oop, oop) \
nonstatic_field(JavaThread, _vm_result_metadata, Metadata*) \
volatile_nonstatic_field(JavaThread, _current_pending_monitor, ObjectMonitor*) \
nonstatic_field(JavaThread, _current_pending_monitor_is_from_java, bool) \
volatile_nonstatic_field(JavaThread, _current_waiting_monitor, ObjectMonitor*) \
Expand Down