Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions src/cmd/go/internal/modload/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -1525,13 +1525,39 @@ func rootsFromModFile(ld *Loader, m module.Version, modFile *modfile.File, addTo
}
goVersion := gover.FromGoMod(modFile)
var toolchain string
if addToolchainRoot && modFile.Toolchain != nil {
toolchain = modFile.Toolchain.Name
if addToolchainRoot {
toolchain = toolchainForModFile(modFile)
}
roots = appendGoAndToolchainRoots(roots, goVersion, toolchain, direct)
return roots, direct
}

func toolchainForModFile(modFile *modfile.File) string {
toolchain := ""
if modFile.Toolchain != nil {
toolchain = modFile.Toolchain.Name
}

required := godebugDefaultToolchain(modFile.Godebug)
if required == "" || toolchain == "default" {
return toolchain
}
if toolchain == "" || gover.Compare(gover.FromToolchain(toolchain), gover.FromToolchain(required)) < 0 {
return required
}
return toolchain
}

func godebugDefaultToolchain(godebugs []*modfile.Godebug) string {
toolchain := ""
for _, g := range godebugs {
if g.Key == "default" && strings.HasPrefix(g.Value, "go") {
toolchain = g.Value
}
}
return toolchain
}

func appendGoAndToolchainRoots(roots []module.Version, goVersion, toolchain string, direct map[string]bool) []module.Version {
// Add explicit go and toolchain versions, inferring as needed.
roots = append(roots, module.Version{Path: "go", Version: goVersion})
Expand Down
13 changes: 13 additions & 0 deletions src/cmd/go/testdata/script/mod_tidy_godebug_toolchain.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
env TESTGO_VERSION=go1.26.0
env TESTGO_VERSION_SWITCH=switch
env GOTOOLCHAIN=auto

go mod init m
go get go@1.25.0
go mod edit -godebug default=go1.26.0
go mod tidy
grep 'toolchain go1.26.0' go.mod

env TESTGO_VERSION=go1.25.0
go list -m
stdout '^m$'