From: Rob Findley <rfindley@google.com>
Date: Fri, 15 Jan 2021 16:30:49 +0000 (-0500)
Subject: [dev.typeparams] go/types: don't modify Named.underlying in validType
X-Git-Tag: go1.17beta1~1473^2~95
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3e15bf77166bc89fb6af8649da560b09d9c0ada5;p=gostls13.git

[dev.typeparams] go/types: don't modify Named.underlying in validType

This was fixed on dev.go2go in CL 240901, but accidentally omitted from
the merge.

Change-Id: I9020eb51dac4aa07d57c3de747d33ba84abb6386
Reviewed-on: https://go-review.googlesource.com/c/go/+/284254
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>
Trust: Robert Griesemer <gri@golang.org>
Trust: Robert Findley <rfindley@google.com>
---

diff --git a/src/go/types/decl.go b/src/go/types/decl.go
index a822e08b1e..e62edfadb2 100644
--- a/src/go/types/decl.go
+++ b/src/go/types/decl.go
@@ -342,7 +342,6 @@ func (check *Checker) validType(typ Type, path []Object) typeInfo {
 				if tn == t.obj {
 					check.cycleError(path[i:])
 					t.info = invalid
-					t.underlying = Typ[Invalid]
 					return t.info
 				}
 			}