src/hotspot/cpu/riscv/gc/shenandoah/shenandoahBarrierSetAssembler_riscv.hpp

@@ -92,20 +92,24 @@
    void generate_c1_pre_barrier_runtime_stub(StubAssembler* sasm);
    void generate_c1_load_reference_barrier_runtime_stub(StubAssembler* sasm, DecoratorSet decorators);
  #endif
  
  #ifdef COMPILER2
-   // Entry points from Matcher
+   // Barriers hotpatching
+   static address parse_stub_address(address pc);
+   static void patch_branch_to_nop(address pc);
+   static void patch_nop_to_branch(address pc, address stub_addr);
+ 
+ // Entry points from Matcher
    void load_c2(const MachNode* node, MacroAssembler* masm, Register dst, Address addr);
    void store_c2(const MachNode* node, MacroAssembler* masm, Address dst, bool dst_narrow, Register src,
        bool src_narrow, Register tmp);
    void compare_and_set_c2(const MachNode* node, MacroAssembler* masm, Register res, Register addr, Register oldval,
        Register newval, Register tmp, bool exchange, bool maybe_null, bool narrow, bool weak);
    void get_and_set_c2(const MachNode* node, MacroAssembler* masm, Register preval, Register newval,
        Register addr, Register tmp);
  
-   void gc_state_check_c2(MacroAssembler* masm, Register rscratch, const unsigned char test_state, BarrierStubC2* slow_stub);
    void card_barrier_c2(const MachNode* node, MacroAssembler* masm, Address addr);
    virtual void try_resolve_weak_handle_in_c2(MacroAssembler* masm, Register obj, Register tmp, Label& slow_path);
  #endif
  };