src/hotspot/cpu/ppc/gc/shenandoah/c1/shenandoahBarrierSetC1_ppc.cpp

*** 105,15 ***
        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(), t1, t2, 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();
    BasicType type = access.type();
--- 105,25 ---
        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(), t1, t2, result));
  
+       if (ShenandoahCardBarrier) {
+         post_barrier(access, access.resolved_addr(), new_value.result());
+       }
+ 
        return result;
      }
    }
  
!   LIR_Opr result = BarrierSetC1::atomic_cmpxchg_at_resolved(access, cmp_value, new_value);
+ 
+   if (ShenandoahCardBarrier && access.is_oop()) {
+     post_barrier(access, access.resolved_addr(), new_value.result());
+   }
+ 
+   return result;
  }
  
  LIR_Opr ShenandoahBarrierSetC1::atomic_xchg_at_resolved(LIRAccess &access, LIRItem &value) {
    LIRGenerator* gen = access.gen();
    BasicType type = access.type();

*** 139,9 ***
--- 149,13 ---
      result = tmp_barrier;
  
      if (ShenandoahSATBBarrier) {
        pre_barrier(access.gen(), access.access_emit_info(), access.decorators(), LIR_OprFact::illegalOpr, result);
      }
+ 
+     if (ShenandoahCardBarrier) {
+       post_barrier(access, access.resolved_addr(), result);
+     }
    }
  
    return result;
  }