diff --git a/src/hotspot/cpu/riscv/gc/g1/g1_riscv.ad b/src/hotspot/cpu/riscv/gc/g1/g1_riscv.ad
index df1c1ba55f528..d21031f8c8380 100644
--- a/src/hotspot/cpu/riscv/gc/g1/g1_riscv.ad
+++ b/src/hotspot/cpu/riscv/gc/g1/g1_riscv.ad
@@ -89,7 +89,7 @@ instruct g1StoreP(indirect mem, iRegP src, iRegPNoSp tmp1, iRegPNoSp tmp2, iRegP
                          $tmp2$$Register /* tmp1 */,
                          $tmp3$$Register /* tmp2 */,
                          RegSet::of($mem$$Register, $src$$Register) /* preserve */);
-    __ sd($src$$Register, $mem$$Register);
+    __ sd($src$$Register, Address($mem$$Register));
     g1_post_write_barrier(masm, this,
                           $mem$$Register  /* store_addr */,
                           $src$$Register  /* new_val */,
@@ -114,7 +114,7 @@ instruct g1StoreN(indirect mem, iRegN src, iRegPNoSp tmp1, iRegPNoSp tmp2, iRegP
                          $tmp2$$Register /* tmp1 */,
                          $tmp3$$Register /* tmp2 */,
                          RegSet::of($mem$$Register, $src$$Register) /* preserve */);
-    __ sw($src$$Register, $mem$$Register);
+    __ sw($src$$Register, Address($mem$$Register));
     if ((barrier_data() & G1C2BarrierPost) != 0) {
       if ((barrier_data() & G1C2BarrierPostNotNull) == 0) {
         __ decode_heap_oop($tmp1$$Register, $src$$Register);
@@ -152,7 +152,7 @@ instruct g1EncodePAndStoreN(indirect mem, iRegP src, iRegPNoSp tmp1, iRegPNoSp t
     } else {
       __ encode_heap_oop_not_null($tmp1$$Register, $src$$Register);
     }
-    __ sw($tmp1$$Register, $mem$$Register);
+    __ sw($tmp1$$Register, Address($mem$$Register));
     g1_post_write_barrier(masm, this,
                           $mem$$Register  /* store_addr */,
                           $src$$Register  /* new_val */,