Rename lc

robehn · Jun 27, 2024 · 442680b · 442680b
1 parent d77ead9
commit 442680b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -4024,7 +4024,7 @@ address MacroAssembler::trampoline_call(Address entry) {
   return call_pc;
 }
 
-address MacroAssembler::load_call(Address entry) {
+address MacroAssembler::load_and_call(Address entry) {
   assert(entry.rspec().type() == relocInfo::runtime_call_type ||
          entry.rspec().type() == relocInfo::opt_virtual_call_type ||
          entry.rspec().type() == relocInfo::static_call_type ||

diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
@@ -1273,11 +1273,11 @@ class MacroAssembler: public Assembler {
   //
   // Return: the call PC or null if CodeCache is full.
   address patchable_far_call(Address entry) {
-    return UseTrampolines ? trampoline_call(entry) : load_call(entry);
+    return UseTrampolines ? trampoline_call(entry) : load_and_call(entry);
   }
  private:
   address trampoline_call(Address entry);
-  address load_call(Address entry);
+  address load_and_call(Address entry);
  public:
 
   address ic_call(address entry, jint method_index = 0);