runtime: allow GC drain whenever write barrier is enabled

Currently we hand-code a set of phases when draining is allowed.
However, this set of phases is conservative. The critical invariant is
simply that the write barrier must be enabled if we're draining.

Shortly we're going to enable mutator assists during the scan phase,
which means we may drain during the scan phase. In preparation, this
commit generalizes these assertions to check the fundamental condition
that the write barrier is enabled, rather than checking that we're in
any particular phase.

Change-Id: I0e1bec1ca823d4a697a0831ec4c50f5dd3f2a893
Reviewed-on: https://go-review.googlesource.com/12673
Reviewed-by: Russ Cox <rsc@golang.org>

diff --git a/src/runtime/mgcmark.go b/src/runtime/mgcmark.go
index 6b622511b5f0d189528ce33f8d6b4379804a7d5f..f7ef41692c497fc9b4bb88ea1ef4575f6b578c01 100644 (file)
--- a/src/runtime/mgcmark.go
+++ b/src/runtime/mgcmark.go
@@ -644,8 +644,8 @@ func setNextBarrierPC(pc uintptr) {
 // credit exceeds flushScanCredit.
 //go:nowritebarrier
 func gcDrain(gcw *gcWork, flushScanCredit int64) {
-       if gcphase != _GCmark && gcphase != _GCmarktermination {
-               throw("scanblock phase incorrect")
+       if !writeBarrierEnabled {
+               throw("gcDrain phase incorrect")
        }
 
        var lastScanFlush, nextScanFlush int64
@@ -696,7 +696,7 @@ func gcDrain(gcw *gcWork, flushScanCredit int64) {
 // get work, even though there may be more work in the system.
 //go:nowritebarrier
 func gcDrainUntilPreempt(gcw *gcWork, flushScanCredit int64) {
-       if gcphase != _GCmark {
+       if !writeBarrierEnabled {
                println("gcphase =", gcphase)
                throw("gcDrainUntilPreempt phase incorrect")
        }
@@ -750,6 +750,9 @@ func gcDrainUntilPreempt(gcw *gcWork, flushScanCredit int64) {
 // scanning is always done in whole object increments.
 //go:nowritebarrier
 func gcDrainN(gcw *gcWork, scanWork int64) {
+       if !writeBarrierEnabled {
+               throw("gcDrainN phase incorrect")
+       }
        targetScanWork := gcw.scanWork + scanWork
        for gcw.scanWork < targetScanWork {
                // This might be a good place to add prefetch code...