From 522eace4ca496626bcb3b65f9dcb6e8db2673fed Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Tue, 18 Apr 2023 19:20:28 -0700 Subject: [PATCH] go/types, types2: be deliberate with Checker.use in Checker.assignVar Follow-up on comment in CL 486135. Cleanup. Change-Id: Ib0480d52e30687350f8328965c18fa83262df0a3 Reviewed-on: https://go-review.googlesource.com/c/go/+/486215 Run-TryBot: Robert Griesemer Auto-Submit: Robert Griesemer Reviewed-by: Robert Griesemer TryBot-Result: Gopher Robot Reviewed-by: Robert Findley --- src/cmd/compile/internal/types2/assignments.go | 3 ++- src/go/types/assignments.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cmd/compile/internal/types2/assignments.go b/src/cmd/compile/internal/types2/assignments.go index 59f29b8f62..15d2a89934 100644 --- a/src/cmd/compile/internal/types2/assignments.go +++ b/src/cmd/compile/internal/types2/assignments.go @@ -235,9 +235,10 @@ func (check *Checker) lhsVar(lhs syntax.Expr) Type { func (check *Checker) assignVar(lhs, rhs syntax.Expr, x *operand) { T := check.lhsVar(lhs) // nil if lhs is _ if T == Typ[Invalid] { - check.use(rhs) if x != nil { x.mode = invalid + } else { + check.use(rhs) } return } diff --git a/src/go/types/assignments.go b/src/go/types/assignments.go index f036142caa..b0d11dfb82 100644 --- a/src/go/types/assignments.go +++ b/src/go/types/assignments.go @@ -234,9 +234,10 @@ func (check *Checker) lhsVar(lhs ast.Expr) Type { func (check *Checker) assignVar(lhs, rhs ast.Expr, x *operand) { T := check.lhsVar(lhs) // nil if lhs is _ if T == Typ[Invalid] { - check.use(rhs) if x != nil { x.mode = invalid + } else { + check.use(rhs) } return } -- 2.48.1