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

go/types, types2: pull up Unalias call to cover all of cycleFinder.typ 

Without a test because it's unclear the situation can actually occur,
but the code is correct because it now mimics the behavior without
explicit Alias nodes.

For #67547.

Change-Id: I21a31af28880ca6d599fe465563d9574c26ed1f1
Reviewed-on: https://go-review.googlesource.com/c/go/+/588117
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Robert Griesemer <gri@google.com>
Auto-Submit: Robert Griesemer <gri@google.com>
Reviewed-by: Robert Findley <rfindley@google.com>
This commit is contained in:
Robert Griesemer 2024-05-23 16:30:20 -07:00 committed by Gopher Robot
parent 35ef4a9f33
commit 3ea2be1e47
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cmd/compile/internal/types2/infer.go
View File

@ -693,6 +693,7 @@ type cycleFinder struct {
}
func (w *cycleFinder) typ(typ Type) {
typ = Unalias(typ)
if w.seen[typ] {
// We have seen typ before. If it is one of the type parameters
// in w.tparams, iterative substitution will lead to infinite expansion.
@ -714,8 +715,8 @@ func (w *cycleFinder) typ(typ Type) {
case *Basic:
// nothing to do
case *Alias:
w.typ(Unalias(t))
// *Alias:
// This case should not occur because of Unalias(typ) at the top.
case *Array:
w.typ(t.elem)

5
src/go/types/infer.go
View File

@ -696,6 +696,7 @@ type cycleFinder struct {
}
func (w *cycleFinder) typ(typ Type) {
typ = Unalias(typ)
if w.seen[typ] {
// We have seen typ before. If it is one of the type parameters
// in w.tparams, iterative substitution will lead to infinite expansion.
@ -717,8 +718,8 @@ func (w *cycleFinder) typ(typ Type) {
case *Basic:
// nothing to do
case *Alias:
w.typ(Unalias(t))
// *Alias:
// This case should not occur because of Unalias(typ) at the top.
case *Array:
w.typ(t.elem)