runtime: address comments from CL 32357

Change-Id: I174d7307bfdd8ec57bb4266dab8569fd2234abb4
Reviewed-on: https://go-review.googlesource.com/32610
Reviewed-by: Austin Clements <austin@google.com>
Run-TryBot: David Crawshaw <crawshaw@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/runtime/proc.go b/src/runtime/proc.go
index 1f47dc4de402e5f39cd566966ed309a66c565a8b..baec534aaf7cde086737788419c7feb6afa02e77 100644 (file)
--- a/src/runtime/proc.go
+++ b/src/runtime/proc.go
@@ -475,7 +475,7 @@ func schedinit() {
        goargs()
        goenvs()
        parsedebugvars()
-       gcinit() // requires modulesinit
+       gcinit()
 
        sched.lastpoll = uint64(nanotime())
        procs := ncpu

diff --git a/src/runtime/symtab.go b/src/runtime/symtab.go
index 9ec95d7a0cafbac54ca86c9e5944d44433117a53..bba3ccfc2069c7ca2f23b0870fae7157aadb8230 100644 (file)
--- a/src/runtime/symtab.go
+++ b/src/runtime/symtab.go
@@ -267,13 +267,10 @@ func activeModules() []*moduledata {
 //
 // Only one goroutine may call modulesinit at a time.
 func modulesinit() {
-       oldNum := len(activeModules())
        modules := new([]*moduledata)
-       num := 0
        for md := &firstmoduledata; md != nil; md = md.next {
                *modules = append(*modules, md)
-               num++
-               if num > oldNum {
+               if md.gcdatamask == (bitvector{}) {
                        md.gcdatamask = progToPointerMask((*byte)(unsafe.Pointer(md.gcdata)), md.edata-md.data)
                        md.gcbssmask = progToPointerMask((*byte)(unsafe.Pointer(md.gcbss)), md.ebss-md.bss)
                }