src/hotspot/cpu/riscv/gc/shenandoah/c1/shenandoahBarrierSetC1_riscv.cpp

@@ -76,13 +76,18 @@
        LIR_Opr tmp2 = gen->new_register(T_OBJECT);
        LIR_Opr addr = access.resolved_addr()->as_address_ptr()->base();
        LIR_Opr result = gen->new_register(T_INT);
  
        __ append(new LIR_OpShenandoahCompareAndSwap(addr, cmp_value.result(), new_value.result(), tmp1, tmp2, result));
+ 
+       if (ShenandoahCardBarrier) {
+         post_barrier(access, access.resolved_addr(), new_value.result());
+       }
        return result;
      }
    }
+ 
    return BarrierSetC1::atomic_cmpxchg_at_resolved(access, cmp_value, new_value);
  }
  
  LIR_Opr ShenandoahBarrierSetC1::atomic_xchg_at_resolved(LIRAccess& access, LIRItem& value) {
    LIRGenerator* gen = access.gen();

@@ -103,9 +108,12 @@
      result = tmp_opr;
      if (ShenandoahSATBBarrier) {
        pre_barrier(access.gen(), access.access_emit_info(), access.decorators(), LIR_OprFact::illegalOpr,
                    result /* pre_val */);
      }
+     if (ShenandoahCardBarrier) {
+       post_barrier(access, access.resolved_addr(), result);
+     }
    }
  
    return result;
  }