cmd/compile: do not set ONAME type when evaluated in type context

cuonglm · cuonglm · commit c082f9fee0e0 · 2021-03-05T18:47:09.000Z
Updates #43311 Change-Id: I26e397d071b434256dab0cc7fff9d134b80bd6e3 Reviewed-on: https://go-review.googlesource.com/c/go/+/298711 Trust: Cuong Manh Le <cuong.manhle.vn@gmail.com> Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Matthew Dempsky <mdempsky@google.com>
diff --git a/src/cmd/compile/internal/typecheck/typecheck.go b/src/cmd/compile/internal/typecheck/typecheck.go
@@ -446,7 +446,11 @@ func typecheck(n ir.Node, top int) (res ir.Node) {
 	case top&(ctxType|ctxExpr) == ctxType && n.Op() != ir.OTYPE && n.Op() != ir.ONONAME && (t != nil || n.Op() == ir.ONAME):
 		base.Errorf("%v is not a type", n)
 		if t != nil {
-			n.SetType(nil)
+			if n.Op() == ir.ONAME {
+				t.SetBroke(true)
+			} else {
+				n.SetType(nil)
+			}
 		}
 
 	}
diff --git a/test/fixedbugs/issue22389.go b/test/fixedbugs/issue22389.go
@@ -1,4 +1,4 @@
-// errorcheck
+// errorcheck -d=panic
 
 // Copyright 2017 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,11 @@ func typecheck(n ir.Node, top int) (res ir.Node) {`
`446`	`446`	`case top&(ctxType\|ctxExpr) == ctxType && n.Op() != ir.OTYPE && n.Op() != ir.ONONAME && (t != nil \|\| n.Op() == ir.ONAME):`
`447`	`447`	`base.Errorf("%v is not a type", n)`
`448`	`448`	`if t != nil {`
`449`		`- n.SetType(nil)`
	`449`	`+ if n.Op() == ir.ONAME {`
	`450`	`+ t.SetBroke(true)`
	`451`	`+ } else {`
	`452`	`+ n.SetType(nil)`
	`453`	`+ }`
`450`	`454`	`}`
`451`	`455`
`452`	`456`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// errorcheck`
	`1`	`+// errorcheck -d=panic`
`2`	`2`
`3`	`3`	`// Copyright 2017 The Go Authors. All rights reserved.`
`4`	`4`	`// Use of this source code is governed by a BSD-style`