Minor review comments

robehn · Jun 20, 2024 · e47f245 · e47f245
1 parent 0dfa4c8
commit e47f245
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/hotspot/cpu/riscv/codeBuffer_riscv.cpp b/src/hotspot/cpu/riscv/codeBuffer_riscv.cpp
@@ -55,7 +55,7 @@ static bool emit_shared_trampolines(CodeBuffer* cb, CodeBuffer::SharedTrampoline
   MacroAssembler masm(cb);
 
   auto emit = [&](address dest, const CodeBuffer::Offsets &offsets) {
-    assert(cb->stubs()->remaining() >= MacroAssembler::max_patchable_far_call_stub_size(), "pre-allocated trampolines");
+    assert(cb->stubs()->remaining() >= MacroAssembler::NativeShortCall::trampoline_size, "pre-allocated trampolines");
     LinkedListIterator<int> it(offsets.head());
     int offset = *it.next();
     address stub = __ emit_trampoline_stub(offset, dest);
@@ -71,7 +71,7 @@ static bool emit_shared_trampolines(CodeBuffer* cb, CodeBuffer::SharedTrampoline
   };
 
   assert(requests->number_of_entries() >= 1, "at least one");
-  const int total_requested_size = MacroAssembler::max_patchable_far_call_stub_size() * requests->number_of_entries();
+  const int total_requested_size = MacroAssembler::NativeShortCall::trampoline_size * requests->number_of_entries();
   if (cb->stubs()->maybe_expand_to_ensure_remaining(total_requested_size) && cb->blob() == nullptr) {
     return false;
   }

diff --git a/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp b/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
@@ -3928,7 +3928,7 @@ int MacroAssembler::max_patchable_far_call_stub_size() {
   if (UseTrampolines) {
     return instruction_size + MacroAssembler::NativeShortCall::trampoline_size;
   }
-  return 2 * wordSize;
+  return instruction_size + wordSize;
 }
 
 int MacroAssembler::static_call_stub_size() {