diff --git a/src/hotspot/cpu/riscv64/assembler_riscv64.hpp b/src/hotspot/cpu/riscv64/assembler_riscv64.hpp
index 1dcb18ec93a..580234a60eb 100644
--- a/src/hotspot/cpu/riscv64/assembler_riscv64.hpp
+++ b/src/hotspot/cpu/riscv64/assembler_riscv64.hpp
@@ -2830,13 +2830,6 @@ enum Nf {
   Assembler(CodeBuffer* code) : AbstractAssembler(code) {
   }
 
-  virtual RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr,
-                                                Register tmp,
-                                                int offset) {
-    ShouldNotCallThis();
-    return RegisterOrConstant();
-  }
-
   // Stack overflow checking
   virtual void bang_stack_with_offset(int offset) { Unimplemented(); }
 
diff --git a/src/hotspot/cpu/riscv64/javaFrameAnchor_riscv64.hpp b/src/hotspot/cpu/riscv64/javaFrameAnchor_riscv64.hpp
index 751497053c9..299c8246c8b 100644
--- a/src/hotspot/cpu/riscv64/javaFrameAnchor_riscv64.hpp
+++ b/src/hotspot/cpu/riscv64/javaFrameAnchor_riscv64.hpp
@@ -80,10 +80,8 @@
 
 public:
 
-  void set_last_Java_sp(intptr_t* java_sp)           { _last_Java_sp = java_sp; OrderAccess::release(); }
+  void set_last_Java_sp(intptr_t* java_sp)       { _last_Java_sp = java_sp; OrderAccess::release(); }
 
-  intptr_t*   last_Java_fp(void)                     { return _last_Java_fp; }
-  // Assert (last_Java_sp == NULL || fp == NULL)
-  void set_last_Java_fp(intptr_t* java_fp)           { OrderAccess::release(); _last_Java_fp = java_fp; }
+  intptr_t*   last_Java_fp(void)                 { return _last_Java_fp; }
 
 #endif // CPU_RISCV64_JAVAFRAMEANCHOR_RISCV64_HPP
diff --git a/src/hotspot/cpu/riscv64/macroAssembler_riscv64.hpp b/src/hotspot/cpu/riscv64/macroAssembler_riscv64.hpp
index 8413e142642..616c085a22b 100644
--- a/src/hotspot/cpu/riscv64/macroAssembler_riscv64.hpp
+++ b/src/hotspot/cpu/riscv64/macroAssembler_riscv64.hpp
@@ -366,12 +366,6 @@ class MacroAssembler: public Assembler {
 
   void should_not_reach_here(bool compressed = true) { stop("should not reach here", compressed); }
 
-  virtual RegisterOrConstant delayed_value_impl(intptr_t* delayed_value_addr,
-                                                Register tmp,
-                                                int offset) {
-    return RegisterOrConstant(tmp);
-  }
-
   static address target_addr_for_insn(address insn_addr);
 
   // Required platform-specific helpers for Label::patch_instructions.
diff --git a/src/hotspot/cpu/riscv64/nativeInst_riscv64.hpp b/src/hotspot/cpu/riscv64/nativeInst_riscv64.hpp
index ecfe19fd056..47e2c5a2c97 100644
--- a/src/hotspot/cpu/riscv64/nativeInst_riscv64.hpp
+++ b/src/hotspot/cpu/riscv64/nativeInst_riscv64.hpp
@@ -506,9 +506,6 @@ class NativeJump: public NativeInstruction {
 
   void verify();
 
-  // Unit testing stuff
-  static void test() {}
-
   // Insertion of native jump instruction
   static void insert(address code_pos, address entry);
   // MT-safe insertion of native jump at verified method entry