Merge "[dev.ssa] Merge remote-tracking branch 'origin/master' into ssamerge" into...

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

diff --git a/src/runtime/mgc.go b/src/runtime/mgc.go
index 102d44160e6c881c6ff025c7cce53655e7eae4c9..138a623ca55d712c8041bbeb91e2393b03a415e9 100644 (file)
--- a/src/runtime/mgc.go
+++ b/src/runtime/mgc.go
@@ -1556,8 +1556,8 @@ func gcMark(start_time int64) {
 
        gchelperstart()
 
-       var gcw gcWork
-       gcDrain(&gcw, gcDrainBlock)
+       gcw := &getg().m.p.ptr().gcw
+       gcDrain(gcw, gcDrainBlock)
        gcw.dispose()
 
        gcMarkRootCheck()
@@ -1799,8 +1799,8 @@ func gchelper() {
 
        // Parallel mark over GC roots and heap
        if gcphase == _GCmarktermination {
-               var gcw gcWork
-               gcDrain(&gcw, gcDrainBlock) // blocks in getfull
+               gcw := &_g_.m.p.ptr().gcw
+               gcDrain(gcw, gcDrainBlock) // blocks in getfull
                gcw.dispose()
        }