runtime: compute data and bss root work units in one loop

Change-Id: Ia730ca244c83db925879de206809938aeb969cdd
GitHub-Last-Rev: 711b8b8b935552eea6136242821444e83fc23d38
GitHub-Pull-Request: golang/go#64349
Reviewed-on: https://go-review.googlesource.com/c/go/+/544478
Reviewed-by: Keith Randall <khr@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Reviewed-by: Keith Randall <khr@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Michael Knyszek <mknyszek@google.com>

diff --git a/src/runtime/mgcmark.go b/src/runtime/mgcmark.go
index b515568eb003e4985ebecf26147cce55b0879326..e118ba69af0ae02ad6cfb4430d50242743c08ed5 100644 (file)
--- a/src/runtime/mgcmark.go
+++ b/src/runtime/mgcmark.go
@@ -73,9 +73,7 @@ func gcMarkRootPrepare() {
                if nDataRoots > work.nDataRoots {
                        work.nDataRoots = nDataRoots
                }
-       }
 
-       for _, datap := range activeModules() {
                nBSSRoots := nBlocks(datap.ebss - datap.bss)
                if nBSSRoots > work.nBSSRoots {
                        work.nBSSRoots = nBSSRoots