Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

go/types, types2: ensure deterministic output when reporting an init cycle

Browse source 
Fixes #71254

Change-Id: Ie3bad281403c8ff6215e03d92760b9a378714cee
GitHub-Last-Rev: 9b804a7842421dca6a97c57ce18523b593b0817d
GitHub-Pull-Request: golang/go#71264
Reviewed-on: https://go-review.googlesource.com/c/go/+/642396
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Robert Griesemer <gri@google.com>
Reviewed-by: Robert Findley <rfindley@google.com>
Auto-Submit: Robert Griesemer <gri@google.com>
This commit is contained in:
Wingrez 2025-01-17 00:38:59 +00:00 • committed by Gopher Robot
parent 80bf7d83ed
commit 87023bb27f
3 changed files with 34 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/cmd/compile/internal/types2/initorder.go
View file

@ -10,6 +10,7 @@ import (
"fmt" "fmt"
. "internal/types/errors" . "internal/types/errors"
"slices" "slices"
"sort"
) )
// initOrder computes the Info.InitOrder for package variables. // initOrder computes the Info.InitOrder for package variables.
@ -139,7 +140,16 @@ func findPath(objMap map[Object]*declInfo, from, to Object, seen map[Object]bool
} }
seen[from] = true seen[from] = true
// sort deps for deterministic result
var deps []Object
for d := range objMap[from].deps { for d := range objMap[from].deps {
deps = append(deps, d)
}
sort.Slice(deps, func(i, j int) bool {
return deps[i].order() < deps[j].order()
})
for _, d := range deps {
if d == to { if d == to {
return []Object{d} return []Object{d}
} }

14
src/cmd/compile/internal/types2/testdata/local/issue71254.go vendored Normal file
View file

@ -0,0 +1,14 @@
// Copyright 2025 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package p
const (
B /* ERROR "initialization cycle: B refers to itself" */ = A + B
A /* ERRORx "initialization cycle for A\\s+.*A refers to B\\s+.*B refers to A" */ = A + B
C /* ERRORx "initialization cycle for C\\s+.*C refers to D\\s+.*D refers to C" */ = E + D
D /* ERRORx "initialization cycle for D\\s+.*D refers to C\\s+.*C refers to D" */ = E + C
E = D + C
)

10
src/go/types/initorder.go
View file

@ -13,6 +13,7 @@ import (
"fmt" "fmt"
. "internal/types/errors" . "internal/types/errors"
"slices" "slices"
"sort"
) )
// initOrder computes the Info.InitOrder for package variables. // initOrder computes the Info.InitOrder for package variables.
@ -142,7 +143,16 @@ func findPath(objMap map[Object]*declInfo, from, to Object, seen map[Object]bool
} }
seen[from] = true seen[from] = true
// sort deps for deterministic result
var deps []Object
for d := range objMap[from].deps { for d := range objMap[from].deps {
deps = append(deps, d)
}
sort.Slice(deps, func(i, j int) bool {
return deps[i].order() < deps[j].order()
})
for _, d := range deps {
if d == to { if d == to {
return []Object{d} return []Object{d}
} }