qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 04:58:00 -07:00
Code Releases Activity

go/types: remove superfluous ordinaryType calls

Browse Source 
This is a port of CL 346291 to go/types.

Change-Id: I8f864aca5cdb4037bc27a81cde1597430b9a48db
Reviewed-on: https://go-review.googlesource.com/c/go/+/346559
Trust: Robert Findley <rfindley@google.com>
Run-TryBot: Robert Findley <rfindley@google.com>
Reviewed-by: Robert Griesemer <gri@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
This commit is contained in:
Robert Findley 2021-08-31 18:26:16 -04:00
parent 1a9807906d
commit 36ac2214fa
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/go/types/expr.go
View File

@ -1386,7 +1386,6 @@ func (check *Checker) exprInternal(x *operand, e ast.Expr, hint Type) exprKind {
check.invalidOp(x, _InvalidAssert, "%s is not an interface", x)
goto Error
}
check.ordinaryType(x, xtyp)
// x.(type) expressions are handled explicitly in type switches
if e.Type == nil {
// Don't use invalidAST because this can occur in the AST produced by

1
src/go/types/stmt.go
View File

@ -696,7 +696,6 @@ func (check *Checker) stmt(ctxt stmtContext, s ast.Stmt) {
check.errorf(&x, _InvalidTypeSwitch, "%s is not an interface", &x)
return
}
check.ordinaryType(&x, xtyp)
check.multipleDefaults(s.Body.List)

2
src/go/types/testdata/fixedbugs/issue42758.go2 vendored
View File

@ -28,6 +28,6 @@ func _[T constraint](x interface{}){
}
func _(x constraint /* ERROR contains type constraints */ ) {
switch x /* ERROR contains type constraints */ .(type) {
switch x.(type) { // no need to report another error
}
}

19
src/go/types/typexpr.go
View File

@ -132,32 +132,27 @@ func (check *Checker) typ(e ast.Expr) Type {
}
// varType type-checks the type expression e and returns its type, or Typ[Invalid].
// The type must not be an (uninstantiated) generic type and it must be ordinary
// (see ordinaryType).
// The type must not be an (uninstantiated) generic type and it must not be a
// constraint interface.
func (check *Checker) varType(e ast.Expr) Type {
typ := check.definedType(e, nil)
check.ordinaryType(e, typ)
return typ
}
// ordinaryType reports an error if typ is an interface type containing
// type lists or is (or embeds) the predeclared type comparable.
func (check *Checker) ordinaryType(pos positioner, typ Type) {
// We don't want to call under() (via asInterface) or complete interfaces while we
// are in the middle of type-checking parameter declarations that might belong to
// interface methods. Delay this check to the end of type-checking.
check.later(func() {
if t := asInterface(typ); t != nil {
tset := computeInterfaceTypeSet(check, pos.Pos(), t) // TODO(gri) is this the correct position?
tset := computeInterfaceTypeSet(check, e.Pos(), t) // TODO(gri) is this the correct position?
if tset.IsConstraint() {
if tset.comparable {
check.softErrorf(pos, _Todo, "interface is (or embeds) comparable")
check.softErrorf(e, _Todo, "interface is (or embeds) comparable")
} else {
check.softErrorf(pos, _Todo, "interface contains type constraints")
check.softErrorf(e, _Todo, "interface contains type constraints")
}
}
}
})
return typ
}
// anyType type-checks the type expression e and returns its type, or Typ[Invalid].