mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/go: remove init() to fix precedence issue when setting debug mod info 

Fixes #29628

Change-Id: I95dabed797ef7a1a770b6f4219840f653306af7e
GitHub-Last-Rev: 9275dd8f1c
GitHub-Pull-Request: golang/go#29630
Reviewed-on: https://go-review.googlesource.com/c/157097
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
This commit is contained in:
Viacheslav Poturaev 2019-01-09 12:54:50 +00:00 committed by Bryan C. Mills
parent d82c9a167d
commit 3e9c3cfd1e
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cmd/go/internal/modload/build.go
View File

@ -252,13 +252,10 @@ func findModule(target, path string) module.Version {
func ModInfoProg(info string) []byte { func ModInfoProg(info string) []byte {
// Inject a variable with the debug information as runtime/debug.modinfo, // Inject a variable with the debug information as runtime/debug.modinfo,
// but compile it in package main so that it is specific to the binary. // but compile it in package main so that it is specific to the binary.
// Populate it in an init func so that it will work with go:linkname, // No need to populate in an init func, it will still work with go:linkname,
// but use a string constant instead of the name 'string' in case
// package main shadows the built-in 'string' with some local declaration.
return []byte(fmt.Sprintf(`package main return []byte(fmt.Sprintf(`package main
import _ "unsafe" import _ "unsafe"
//go:linkname __debug_modinfo__ runtime/debug.modinfo //go:linkname __debug_modinfo__ runtime/debug.modinfo
var __debug_modinfo__ = "" var __debug_modinfo__ = %q
func init() { __debug_modinfo__ = %q }
`, string(infoStart)+info+string(infoEnd))) `, string(infoStart)+info+string(infoEnd)))
} }