diff options
| author | Rob Findley <rfindley@google.com> | 2021-07-16 13:03:06 -0400 |
|---|---|---|
| committer | Robert Findley <rfindley@google.com> | 2021-07-17 01:52:18 +0000 |
| commit | df778e6fd9a8ad4f50f734f08b8d07d4ce597c02 (patch) | |
| tree | 4111f432bca69682a251779882bc04557c4ac8b2 /src/go/types/expr.go | |
| parent | e9836fe31897ef6e8a5c82c3f8fc8c2b31a3bea3 (diff) | |
| download | go-df778e6fd9a8ad4f50f734f08b8d07d4ce597c02.tar.gz go-df778e6fd9a8ad4f50f734f08b8d07d4ce597c02.zip | |
[dev.typeparams] go/types: replace optype() with under() in various cases (cleanup)
This is a port of CL 332555 to go/types.
Change-Id: I9b26bba8b605f5bbbd8f0f81fd6651a4a3ff4b57
Reviewed-on: https://go-review.googlesource.com/c/go/+/335111
Reviewed-by: Robert Griesemer <gri@golang.org>
Trust: Robert Findley <rfindley@google.com>
Run-TryBot: Robert Findley <rfindley@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Diffstat (limited to 'src/go/types/expr.go')
| -rw-r--r-- | src/go/types/expr.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/go/types/expr.go b/src/go/types/expr.go index edd7caf1c9..46f6e33463 100644 --- a/src/go/types/expr.go +++ b/src/go/types/expr.go @@ -622,7 +622,7 @@ func (check *Checker) implicitTypeAndValue(x *operand, target Type) (Type, const return x.typ, nil, 0 } - switch t := optype(target).(type) { + switch t := under(target).(type) { case *Basic: if x.mode == constant_ { v, code := check.representation(x, t) @@ -661,7 +661,7 @@ func (check *Checker) implicitTypeAndValue(x *operand, target Type) (Type, const default: return nil, nil, _InvalidUntypedConversion } - case *Union: + case *TypeParam: ok := t.underIs(func(t Type) bool { target, _, _ := check.implicitTypeAndValue(x, t) return target != nil @@ -1151,7 +1151,7 @@ func (check *Checker) exprInternal(x *operand, e ast.Expr, hint Type) exprKind { goto Error } - switch utyp := optype(base).(type) { + switch utyp := under(base).(type) { case *Struct: if len(e.Elts) == 0 { break |