From 26c3827f0b878f5bde7b5261076eb8452847fdb4 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 19 May 2019 13:29:42 -0400 Subject: Nonmoving: Ensure write barrier vanishes in non-threaded RTS --- rts/PrimOps.cmm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rts/PrimOps.cmm') diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm index 6d3df0700c..c076641152 100644 --- a/rts/PrimOps.cmm +++ b/rts/PrimOps.cmm @@ -478,7 +478,7 @@ stg_copyArray_barrier ( W_ hdr_size, gcptr dst, W_ dst_off, W_ n) end = p + WDS(n); again: - IF_WRITE_BARRIER_ENABLED { + IF_NONMOVING_WRITE_BARRIER_ENABLED { ccall updateRemembSetPushClosure_(BaseReg "ptr", W_[p] "ptr"); } p = p + WDS(1); @@ -494,7 +494,7 @@ stg_copySmallArrayzh ( gcptr src, W_ src_off, gcptr dst, W_ dst_off, W_ n) W_ dst_p, src_p, bytes; if (n > 0) { - IF_WRITE_BARRIER_ENABLED { + IF_NONMOVING_WRITE_BARRIER_ENABLED { call stg_copyArray_barrier(SIZEOF_StgSmallMutArrPtrs, dst, dst_off, n); } @@ -515,7 +515,7 @@ stg_copySmallMutableArrayzh ( gcptr src, W_ src_off, gcptr dst, W_ dst_off, W_ n W_ dst_p, src_p, bytes; if (n > 0) { - IF_WRITE_BARRIER_ENABLED { + IF_NONMOVING_WRITE_BARRIER_ENABLED { call stg_copyArray_barrier(SIZEOF_StgSmallMutArrPtrs, dst, dst_off, n); } -- cgit v1.2.1