cmd/compile,runtime: dedup writeBarrier needed

[gostls13.git] / src / runtime / mbitmap.go

diff --git a/src/runtime/mbitmap.go b/src/runtime/mbitmap.go
index bae90c665a30a66fde7ace93194be117c5599a45..2bcf454797fbc57b870e2bb4a2b3a889dcf3d631 100644 (file)
--- a/src/runtime/mbitmap.go
+++ b/src/runtime/mbitmap.go
@@ -563,7 +563,7 @@ func bulkBarrierPreWrite(dst, src, size uintptr) {
        if (dst|src|size)&(goarch.PtrSize-1) != 0 {
                throw("bulkBarrierPreWrite: unaligned arguments")
        }
-       if !writeBarrier.needed {
+       if !writeBarrier.enabled {
                return
        }
        if s := spanOf(dst); s == nil {
@@ -633,7 +633,7 @@ func bulkBarrierPreWriteSrcOnly(dst, src, size uintptr) {
        if (dst|src|size)&(goarch.PtrSize-1) != 0 {
                throw("bulkBarrierPreWrite: unaligned arguments")
        }
-       if !writeBarrier.needed {
+       if !writeBarrier.enabled {
                return
        }
        buf := &getg().m.p.ptr().wbBuf
@@ -718,7 +718,7 @@ func typeBitsBulkBarrier(typ *_type, dst, src, size uintptr) {
                println("runtime: typeBitsBulkBarrier with type ", toRType(typ).string(), " with GC prog")
                throw("runtime: invalid typeBitsBulkBarrier")
        }
-       if !writeBarrier.needed {
+       if !writeBarrier.enabled {
                return
        }
        ptrmask := typ.GCData