clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-21 18:38:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[dev.typeparams] import operand.go changes from dev.go2go

Browse Source 
This involved some non-trivial changes from dev.go2go, due to the
refactoring of assignability in master.

Change-Id: I73d99053fc8b184ae79b7b8973bd15e69e50fe6b
Reviewed-on: https://go-review.googlesource.com/c/go/+/282119
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>
This commit is contained in:
Rob Findley 2021-01-07 10:55:00 -05:00 committed by Robert Findley
parent 81cd99858d
commit eb53a6c7cf
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/go/types/operand.go
View File

@ -158,7 +158,16 @@ func operandString(x *operand, qf Qualifier) string {
// <typ> // <typ>
if hasType { if hasType {
if x.typ != Typ[Invalid] { if x.typ != Typ[Invalid] {
buf.WriteString(" of type ") var intro string
switch {
case isGeneric(x.typ):
intro = " of generic type "
case asTypeParam(x.typ) != nil:
intro = " of type parameter type "
default:
intro = " of type "
}
buf.WriteString(intro)
WriteType(&buf, x.typ, qf) WriteType(&buf, x.typ, qf)
} else { } else {
buf.WriteString(" with invalid type") buf.WriteString(" with invalid type")
@ -228,20 +237,30 @@ func (x *operand) assignableTo(check *Checker, T Type, reason *string) (bool, er
return true, 0 return true, 0
} }
Vu := V.Underlying() Vu := optype(V)
Tu := T.Underlying() Tu := optype(T)
// x is an untyped value representable by a value of type T. // x is an untyped value representable by a value of type T.
if isUntyped(Vu) { if isUntyped(Vu) {
if t, ok := Tu.(*Basic); ok && x.mode == constant_ { // TODO(rFindley) synchronize this block of code with types2
switch t := Tu.(type) {
case *Basic:
if x.mode == constant_ {
return representableConst(x.val, check, t, nil), _IncompatibleAssign return representableConst(x.val, check, t, nil), _IncompatibleAssign
} }
case *Sum:
return t.is(func(t Type) bool {
// TODO(gri) this could probably be more efficient
ok, _ := x.assignableTo(check, t, reason)
return ok
}), _IncompatibleAssign
}
return check.implicitType(x, Tu) != nil, _IncompatibleAssign return check.implicitType(x, Tu) != nil, _IncompatibleAssign
} }
// Vu is typed // Vu is typed
// x's type V and T have identical underlying types and at least one of V or // x's type V and T have identical underlying types
// T is not a named type. // and at least one of V or T is not a named type
if check.identical(Vu, Tu) && (!isNamed(V) || !isNamed(T)) { if check.identical(Vu, Tu) && (!isNamed(V) || !isNamed(T)) {
return true, 0 return true, 0
} }