From: Robert Griesemer Date: Wed, 21 Feb 2024 23:08:21 +0000 (-0800) Subject: go/types: generate initorder.go from types2 source X-Git-Tag: go1.23rc1~1087 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=629a6f5ae0b3a7b69608bd469ea7bf425768f748;p=gostls13.git go/types: generate initorder.go from types2 source This CL reduces the amount of code that needs to be maintained manually by about 320 LOC. Change-Id: Ib797e86dd4abd3a9fe614787103f0e5cebd5e4ae Reviewed-on: https://go-review.googlesource.com/c/go/+/565838 Reviewed-by: Robert Griesemer Reviewed-by: Robert Findley LUCI-TryBot-Result: Go LUCI Auto-Submit: Robert Griesemer --- diff --git a/src/cmd/compile/internal/types2/initorder.go b/src/cmd/compile/internal/types2/initorder.go index f864876a70..0d28495542 100644 --- a/src/cmd/compile/internal/types2/initorder.go +++ b/src/cmd/compile/internal/types2/initorder.go @@ -314,11 +314,11 @@ func (a nodeQueue) Less(i, j int) bool { return x.ndeps < y.ndeps || x.ndeps == y.ndeps && x.obj.order() < y.obj.order() } -func (a *nodeQueue) Push(x interface{}) { +func (a *nodeQueue) Push(x any) { panic("unreachable") } -func (a *nodeQueue) Pop() interface{} { +func (a *nodeQueue) Pop() any { n := len(*a) x := (*a)[n-1] x.index = -1 // for safety diff --git a/src/go/types/generate_test.go b/src/go/types/generate_test.go index 8bdcb04dfe..893280f39e 100644 --- a/src/go/types/generate_test.go +++ b/src/go/types/generate_test.go @@ -127,6 +127,7 @@ var filemap = map[string]action{ "gcsizes.go": func(f *ast.File) { renameIdents(f, "IsSyncAtomicAlign64->_IsSyncAtomicAlign64") }, "hilbert_test.go": func(f *ast.File) { renameImportPath(f, `"cmd/compile/internal/types2"->"go/types"`) }, "infer.go": func(f *ast.File) { fixTokenPos(f); fixInferSig(f) }, + "initorder.go": nil, // "initorder.go": fixErrErrorfCall, // disabled for now due to unresolved error_ use implications for gopls "instantiate.go": func(f *ast.File) { fixTokenPos(f); fixCheckErrorfCall(f) }, "instantiate_test.go": func(f *ast.File) { renameImportPath(f, `"cmd/compile/internal/types2"->"go/types"`) }, diff --git a/src/go/types/initorder.go b/src/go/types/initorder.go index 99fc6c7e0b..70d2a713bd 100644 --- a/src/go/types/initorder.go +++ b/src/go/types/initorder.go @@ -1,3 +1,5 @@ +// Code generated by "go test -run=Generate -write=all"; DO NOT EDIT. + // Copyright 2014 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.