From: Russ Cox <rsc@golang.org>
Date: Thu, 19 Feb 2015 20:45:29 +0000 (-0500)
Subject: runtime: missed change from reorganization CL
X-Git-Tag: go1.5beta1~1944
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6c4b54f409b537ce60e539e2ec1c56abfe1e145c;p=gostls13.git

runtime: missed change from reorganization CL

That is, I accidentally dropped this change of Austin's
when preparing my CL. I blame Git.

Change-Id: I9dd772c84edefad96c4b16785fdd2dea04a4a0d6
Reviewed-on: https://go-review.googlesource.com/5320
Reviewed-by: Austin Clements <austin@google.com>
---

diff --git a/src/runtime/mgc.go b/src/runtime/mgc.go
index 497695cf18..70661e46d0 100644
--- a/src/runtime/mgc.go
+++ b/src/runtime/mgc.go
@@ -423,7 +423,9 @@ func gcinstallmarkwb() {
 // This is the concurrent mark phase.
 //go:nowritebarrier
 func gcmark_m() {
-	gcDrain(nil)
+	var gcw gcWork
+	gcDrain(&gcw)
+	gcw.dispose()
 	// TODO add another harvestwbuf and reset work.nwait=0, work.ndone=0, and work.nproc=1
 	// and repeat the above gcDrain.
 }