Skip to content

Commit

Permalink
go/types, types2: remove unnecessary pkg argument from verifyVersion
Browse files Browse the repository at this point in the history 
Change-Id: I802a9b8039740e71463694eb5503a81b2b75971d
Reviewed-on: https://go-review.googlesource.com/c/go/+/496919
Reviewed-by: Robert Griesemer <[email protected]>
Run-TryBot: Robert Griesemer <[email protected]>
Reviewed-by: Robert Findley <[email protected]>
Auto-Submit: Robert Griesemer <[email protected]>
TryBot-Result: Gopher Robot <[email protected]>
  • Loading branch information
@griesemer @gopherbot
griesemer authored and gopherbot committed May 22, 2023
1 parent bcf41ab commit 1dad7ef
Show file tree
Hide file tree
Showing 16 changed files with 50 additions and 48 deletions.
14 changes: 7 additions & 7 deletions src/cmd/compile/internal/types2/builtins.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ func (check *Checker) builtin(x *operand, call *syntax.CallExpr, id builtinId) (

case _Clear:
// clear(m)
check.verifyVersionf(check.pkg, call.Fun, go1_21, "clear")
check.verifyVersionf(call.Fun, go1_21, "clear")

if !underIs(x.typ, func(u Type) bool {
switch u.(type) {
Expand Down Expand Up @@ -534,7 +534,7 @@ func (check *Checker) builtin(x *operand, call *syntax.CallExpr, id builtinId) (
case _Max, _Min:
// max(x, ...)
// min(x, ...)
check.verifyVersionf(check.pkg, call.Fun, go1_21, bin.name)
check.verifyVersionf(call.Fun, go1_21, bin.name)

op := token.LSS
if id == _Max {
Expand Down Expand Up @@ -655,7 +655,7 @@ func (check *Checker) builtin(x *operand, call *syntax.CallExpr, id builtinId) (

case _Add:
// unsafe.Add(ptr unsafe.Pointer, len IntegerType) unsafe.Pointer
check.verifyVersionf(check.pkg, call.Fun, go1_17, "unsafe.Add")
check.verifyVersionf(call.Fun, go1_17, "unsafe.Add")

check.assignment(x, Typ[UnsafePointer], "argument to unsafe.Add")
if x.mode == invalid {
Expand Down Expand Up @@ -787,7 +787,7 @@ func (check *Checker) builtin(x *operand, call *syntax.CallExpr, id builtinId) (

case _Slice:
// unsafe.Slice(ptr *T, len IntegerType) []T
check.verifyVersionf(check.pkg, call.Fun, go1_17, "unsafe.Slice")
check.verifyVersionf(call.Fun, go1_17, "unsafe.Slice")

ptr, _ := under(x.typ).(*Pointer) // TODO(gri) should this be coreType rather than under?
if ptr == nil {
Expand All @@ -808,7 +808,7 @@ func (check *Checker) builtin(x *operand, call *syntax.CallExpr, id builtinId) (

case _SliceData:
// unsafe.SliceData(slice []T) *T
check.verifyVersionf(check.pkg, call.Fun, go1_20, "unsafe.SliceData")
check.verifyVersionf(call.Fun, go1_20, "unsafe.SliceData")

slice, _ := under(x.typ).(*Slice) // TODO(gri) should this be coreType rather than under?
if slice == nil {
Expand All @@ -824,7 +824,7 @@ func (check *Checker) builtin(x *operand, call *syntax.CallExpr, id builtinId) (

case _String:
// unsafe.String(ptr *byte, len IntegerType) string
check.verifyVersionf(check.pkg, call.Fun, go1_20, "unsafe.String")
check.verifyVersionf(call.Fun, go1_20, "unsafe.String")

check.assignment(x, NewPointer(universeByte), "argument to unsafe.String")
if x.mode == invalid {
Expand All @@ -844,7 +844,7 @@ func (check *Checker) builtin(x *operand, call *syntax.CallExpr, id builtinId) (

case _StringData:
// unsafe.StringData(str string) *byte
check.verifyVersionf(check.pkg, call.Fun, go1_20, "unsafe.StringData")
check.verifyVersionf(call.Fun, go1_20, "unsafe.StringData")

check.assignment(x, Typ[String], "argument to unsafe.StringData")
if x.mode == invalid {
Expand Down
6 changes: 3 additions & 3 deletions src/cmd/compile/internal/types2/call.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func (check *Checker) funcInst(tsig *Signature, pos syntax.Pos, x *operand, inst
} else {
instErrPos = pos
}
versionErr := !check.verifyVersionf(check.pkg, instErrPos, go1_18, "function instantiation")
versionErr := !check.verifyVersionf(instErrPos, go1_18, "function instantiation")

// targs and xlist are the type arguments and corresponding type expressions, or nil.
var targs []Type
Expand Down Expand Up @@ -311,7 +311,7 @@ func (check *Checker) callExpr(x *operand, call *syntax.CallExpr) exprKind {
// is an error checking its arguments (for example, if an incorrect number
// of arguments is supplied).
if got == want && want > 0 {
check.verifyVersionf(check.pkg, inst, go1_18, "function instantiation")
check.verifyVersionf(inst, go1_18, "function instantiation")
sig = check.instantiateSignature(inst.Pos(), inst, sig, targs, xlist)
// targs have been consumed; proceed with checking arguments of the
// non-generic signature.
Expand Down Expand Up @@ -620,7 +620,7 @@ func (check *Checker) arguments(call *syntax.CallExpr, sig *Signature, targs []T
assert(len(tparams) == len(targs))

// at the moment we only support implicit instantiations of argument functions
_ = len(genericArgs) > 0 && check.verifyVersionf(check.pkg, args[genericArgs[0]], go1_21, "implicitly instantiated function as argument")
_ = len(genericArgs) > 0 && check.verifyVersionf(args[genericArgs[0]], go1_21, "implicitly instantiated function as argument")

// tparams holds the type parameters of the callee and generic function arguments, if any:
// the first n type parameters belong to the callee, followed by mi type parameters for each
Expand Down
4 changes: 2 additions & 2 deletions src/cmd/compile/internal/types2/decl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ func (check *Checker) typeDecl(obj *TypeName, tdecl *syntax.TypeDecl, def *Named
check.validType(t)
}
// If typ is local, an error was already reported where typ is specified/defined.
_ = check.isImportedConstraint(rhs) && check.verifyVersionf(check.pkg, tdecl.Type, go1_18, "using type constraint %s", rhs)
_ = check.isImportedConstraint(rhs) && check.verifyVersionf(tdecl.Type, go1_18, "using type constraint %s", rhs)
}).describef(obj, "validType(%s)", obj.Name())

alias := tdecl.Alias
Expand All @@ -505,7 +505,7 @@ func (check *Checker) typeDecl(obj *TypeName, tdecl *syntax.TypeDecl, def *Named

// alias declaration
if alias {
check.verifyVersionf(check.pkg, tdecl, go1_9, "type aliases")
check.verifyVersionf(tdecl, go1_9, "type aliases")
check.brokenAlias(obj)
rhs = check.typ(tdecl.Type)
check.validAlias(obj, rhs)
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/compile/internal/types2/expr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ func (check *Checker) shift(x, y *operand, e syntax.Expr, op syntax.Operator) {
// Check that RHS is otherwise at least of integer type.
switch {
case allInteger(y.typ):
if !allUnsigned(y.typ) && !check.verifyVersionf(check.pkg, y, go1_13, invalidOp+"signed shift count %s", y) {
if !allUnsigned(y.typ) && !check.verifyVersionf(y, go1_13, invalidOp+"signed shift count %s", y) {
x.mode = invalid
return
}
Expand Down
6 changes: 3 additions & 3 deletions src/cmd/compile/internal/types2/resolver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ func (check *Checker) collectObjects() {
// but there is no corresponding package object.
check.recordDef(file.PkgName, nil)

fileScope := NewScope(check.pkg.scope, syntax.StartPos(file), syntax.EndPos(file), check.filename(fileNo))
fileScope := NewScope(pkg.scope, syntax.StartPos(file), syntax.EndPos(file), check.filename(fileNo))
fileScopes = append(fileScopes, fileScope)
check.recordScope(file, fileScope)

Expand Down Expand Up @@ -406,7 +406,7 @@ func (check *Checker) collectObjects() {
}

case *syntax.TypeDecl:
_ = len(s.TParamList) != 0 && check.verifyVersionf(pkg, s.TParamList[0], go1_18, "type parameter")
_ = len(s.TParamList) != 0 && check.verifyVersionf(s.TParamList[0], go1_18, "type parameter")
obj := NewTypeName(s.Name.Pos(), pkg, s.Name.Value, nil)
check.declarePkgObj(s.Name, obj, &declInfo{file: fileScope, tdecl: s})

Expand Down Expand Up @@ -453,7 +453,7 @@ func (check *Checker) collectObjects() {
}
check.recordDef(s.Name, obj)
}
_ = len(s.TParamList) != 0 && !hasTParamError && check.verifyVersionf(pkg, s.TParamList[0], go1_18, "type parameter")
_ = len(s.TParamList) != 0 && !hasTParamError && check.verifyVersionf(s.TParamList[0], go1_18, "type parameter")
info := &declInfo{file: fileScope, fdecl: s}
// Methods are not package-level objects but we still track them in the
// object map so that we can handle them like regular functions (if the
Expand Down
6 changes: 3 additions & 3 deletions src/cmd/compile/internal/types2/typeset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ func computeInterfaceTypeSet(check *Checker, pos syntax.Pos, ityp *Interface) *_
assert(!isTypeParam(typ))
tset := computeInterfaceTypeSet(check, pos, u)
// If typ is local, an error was already reported where typ is specified/defined.
if check != nil && check.isImportedConstraint(typ) && !check.verifyVersionf(check.pkg, pos, go1_18, "embedding constraint interface %s", typ) {
if check != nil && check.isImportedConstraint(typ) && !check.verifyVersionf(pos, go1_18, "embedding constraint interface %s", typ) {
continue
}
comparable = tset.comparable
Expand All @@ -287,7 +287,7 @@ func computeInterfaceTypeSet(check *Checker, pos syntax.Pos, ityp *Interface) *_
}
terms = tset.terms
case *Union:
if check != nil && !check.verifyVersionf(check.pkg, pos, go1_18, "embedding interface element %s", u) {
if check != nil && !check.verifyVersionf(pos, go1_18, "embedding interface element %s", u) {
continue
}
tset := computeUnionTypeSet(check, unionSets, pos, u)
Expand All @@ -301,7 +301,7 @@ func computeInterfaceTypeSet(check *Checker, pos syntax.Pos, ityp *Interface) *_
if u == Typ[Invalid] {
continue
}
if check != nil && !check.verifyVersionf(check.pkg, pos, go1_18, "embedding non-interface type %s", typ) {
if check != nil && !check.verifyVersionf(pos, go1_18, "embedding non-interface type %s", typ) {
continue
}
terms = termlist{{false, typ}}
Expand Down
4 changes: 2 additions & 2 deletions src/cmd/compile/internal/types2/typexpr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func (check *Checker) ident(x *operand, e *syntax.Name, def *Named, wantType boo
}
return
case universeAny, universeComparable:
if !check.verifyVersionf(check.pkg, e, go1_18, "predeclared %s", e.Value) {
if !check.verifyVersionf(e, go1_18, "predeclared %s", e.Value) {
return // avoid follow-on errors
}
}
Expand Down Expand Up @@ -271,7 +271,7 @@ func (check *Checker) typInternal(e0 syntax.Expr, def *Named) (T Type) {
}

case *syntax.IndexExpr:
check.verifyVersionf(check.pkg, e, go1_18, "type instantiation")
check.verifyVersionf(e, go1_18, "type instantiation")
return check.instantiatedType(e.X, unpackExpr(e.Index), def)

case *syntax.ParenExpr:
Expand Down
7 changes: 4 additions & 3 deletions src/cmd/compile/internal/types2/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,10 @@ func (check *Checker) allowVersion(pkg *Package, at poser, v version) bool {
}

// verifyVersionf is like allowVersion but also accepts a format string and arguments
// which are used to report a version error if allowVersion returns false.
func (check *Checker) verifyVersionf(pkg *Package, at poser, v version, format string, args ...interface{}) bool {
if !check.allowVersion(pkg, at, v) {
// which are used to report a version error if allowVersion returns false. It uses the
// current package.
func (check *Checker) verifyVersionf(at poser, v version, format string, args ...interface{}) bool {
if !check.allowVersion(check.pkg, at, v) {
check.versionErrorf(at, v, format, args...)
return false
}
Expand Down
14 changes: 7 additions & 7 deletions src/go/types/builtins.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func (check *Checker) builtin(x *operand, call *ast.CallExpr, id builtinId) (_ b

case _Clear:
// clear(m)
check.verifyVersionf(check.pkg, call.Fun, go1_21, "clear")
check.verifyVersionf(call.Fun, go1_21, "clear")

if !underIs(x.typ, func(u Type) bool {
switch u.(type) {
Expand Down Expand Up @@ -533,7 +533,7 @@ func (check *Checker) builtin(x *operand, call *ast.CallExpr, id builtinId) (_ b
case _Max, _Min:
// max(x, ...)
// min(x, ...)
check.verifyVersionf(check.pkg, call.Fun, go1_21, bin.name)
check.verifyVersionf(call.Fun, go1_21, bin.name)

op := token.LSS
if id == _Max {
Expand Down Expand Up @@ -654,7 +654,7 @@ func (check *Checker) builtin(x *operand, call *ast.CallExpr, id builtinId) (_ b

case _Add:
// unsafe.Add(ptr unsafe.Pointer, len IntegerType) unsafe.Pointer
check.verifyVersionf(check.pkg, call.Fun, go1_17, "unsafe.Add")
check.verifyVersionf(call.Fun, go1_17, "unsafe.Add")

check.assignment(x, Typ[UnsafePointer], "argument to unsafe.Add")
if x.mode == invalid {
Expand Down Expand Up @@ -786,7 +786,7 @@ func (check *Checker) builtin(x *operand, call *ast.CallExpr, id builtinId) (_ b

case _Slice:
// unsafe.Slice(ptr *T, len IntegerType) []T
check.verifyVersionf(check.pkg, call.Fun, go1_17, "unsafe.Slice")
check.verifyVersionf(call.Fun, go1_17, "unsafe.Slice")

ptr, _ := under(x.typ).(*Pointer) // TODO(gri) should this be coreType rather than under?
if ptr == nil {
Expand All @@ -807,7 +807,7 @@ func (check *Checker) builtin(x *operand, call *ast.CallExpr, id builtinId) (_ b

case _SliceData:
// unsafe.SliceData(slice []T) *T
check.verifyVersionf(check.pkg, call.Fun, go1_20, "unsafe.SliceData")
check.verifyVersionf(call.Fun, go1_20, "unsafe.SliceData")

slice, _ := under(x.typ).(*Slice) // TODO(gri) should this be coreType rather than under?
if slice == nil {
Expand All @@ -823,7 +823,7 @@ func (check *Checker) builtin(x *operand, call *ast.CallExpr, id builtinId) (_ b

case _String:
// unsafe.String(ptr *byte, len IntegerType) string
check.verifyVersionf(check.pkg, call.Fun, go1_20, "unsafe.String")
check.verifyVersionf(call.Fun, go1_20, "unsafe.String")

check.assignment(x, NewPointer(universeByte), "argument to unsafe.String")
if x.mode == invalid {
Expand All @@ -843,7 +843,7 @@ func (check *Checker) builtin(x *operand, call *ast.CallExpr, id builtinId) (_ b

case _StringData:
// unsafe.StringData(str string) *byte
check.verifyVersionf(check.pkg, call.Fun, go1_20, "unsafe.StringData")
check.verifyVersionf(call.Fun, go1_20, "unsafe.StringData")

check.assignment(x, Typ[String], "argument to unsafe.StringData")
if x.mode == invalid {
Expand Down
6 changes: 3 additions & 3 deletions src/go/types/call.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (check *Checker) funcInst(tsig *Signature, pos token.Pos, x *operand, ix *t
} else {
instErrPos = atPos(pos)
}
versionErr := !check.verifyVersionf(check.pkg, instErrPos, go1_18, "function instantiation")
versionErr := !check.verifyVersionf(instErrPos, go1_18, "function instantiation")

// targs and xlist are the type arguments and corresponding type expressions, or nil.
var targs []Type
Expand Down Expand Up @@ -316,7 +316,7 @@ func (check *Checker) callExpr(x *operand, call *ast.CallExpr) exprKind {
// is an error checking its arguments (for example, if an incorrect number
// of arguments is supplied).
if got == want && want > 0 {
check.verifyVersionf(check.pkg, atPos(ix.Lbrack), go1_18, "function instantiation")
check.verifyVersionf(atPos(ix.Lbrack), go1_18, "function instantiation")
sig = check.instantiateSignature(ix.Pos(), ix.Orig, sig, targs, xlist)
// targs have been consumed; proceed with checking arguments of the
// non-generic signature.
Expand Down Expand Up @@ -623,7 +623,7 @@ func (check *Checker) arguments(call *ast.CallExpr, sig *Signature, targs []Type
assert(len(tparams) == len(targs))

// at the moment we only support implicit instantiations of argument functions
_ = len(genericArgs) > 0 && check.verifyVersionf(check.pkg, args[genericArgs[0]], go1_21, "implicitly instantiated function as argument")
_ = len(genericArgs) > 0 && check.verifyVersionf(args[genericArgs[0]], go1_21, "implicitly instantiated function as argument")

// tparams holds the type parameters of the callee and generic function arguments, if any:
// the first n type parameters belong to the callee, followed by mi type parameters for each
Expand Down
4 changes: 2 additions & 2 deletions src/go/types/decl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ func (check *Checker) typeDecl(obj *TypeName, tdecl *ast.TypeSpec, def *Named) {
check.validType(t)
}
// If typ is local, an error was already reported where typ is specified/defined.
_ = check.isImportedConstraint(rhs) && check.verifyVersionf(check.pkg, tdecl.Type, go1_18, "using type constraint %s", rhs)
_ = check.isImportedConstraint(rhs) && check.verifyVersionf(tdecl.Type, go1_18, "using type constraint %s", rhs)
}).describef(obj, "validType(%s)", obj.Name())

alias := tdecl.Assign.IsValid()
Expand All @@ -574,7 +574,7 @@ func (check *Checker) typeDecl(obj *TypeName, tdecl *ast.TypeSpec, def *Named) {

// alias declaration
if alias {
check.verifyVersionf(check.pkg, atPos(tdecl.Assign), go1_9, "type aliases")
check.verifyVersionf(atPos(tdecl.Assign), go1_9, "type aliases")
check.brokenAlias(obj)
rhs = check.typ(tdecl.Type)
check.validAlias(obj, rhs)
Expand Down
2 changes: 1 addition & 1 deletion src/go/types/expr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ func (check *Checker) shift(x, y *operand, e ast.Expr, op token.Token) {
// Check that RHS is otherwise at least of integer type.
switch {
case allInteger(y.typ):
if !allUnsigned(y.typ) && !check.verifyVersionf(check.pkg, y, go1_13, invalidOp+"signed shift count %s", y) {
if !allUnsigned(y.typ) && !check.verifyVersionf(y, go1_13, invalidOp+"signed shift count %s", y) {
x.mode = invalid
return
}
Expand Down
6 changes: 3 additions & 3 deletions src/go/types/resolver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ func (check *Checker) collectObjects() {
if f := check.fset.File(file.Pos()); f != nil {
pos, end = token.Pos(f.Base()), token.Pos(f.Base()+f.Size())
}
fileScope := NewScope(check.pkg.scope, pos, end, check.filename(fileNo))
fileScope := NewScope(pkg.scope, pos, end, check.filename(fileNo))
fileScopes = append(fileScopes, fileScope)
check.recordScope(file, fileScope)

Expand Down Expand Up @@ -386,7 +386,7 @@ func (check *Checker) collectObjects() {
check.declarePkgObj(name, obj, di)
}
case typeDecl:
_ = d.spec.TypeParams.NumFields() != 0 && check.verifyVersionf(pkg, d.spec.TypeParams.List[0], go1_18, "type parameter")
_ = d.spec.TypeParams.NumFields() != 0 && check.verifyVersionf(d.spec.TypeParams.List[0], go1_18, "type parameter")
obj := NewTypeName(d.spec.Name.Pos(), pkg, d.spec.Name.Name, nil)
check.declarePkgObj(d.spec.Name, obj, &declInfo{file: fileScope, tdecl: d.spec})
case funcDecl:
Expand Down Expand Up @@ -442,7 +442,7 @@ func (check *Checker) collectObjects() {
}
check.recordDef(d.decl.Name, obj)
}
_ = d.decl.Type.TypeParams.NumFields() != 0 && !hasTParamError && check.verifyVersionf(pkg, d.decl.Type.TypeParams.List[0], go1_18, "type parameter")
_ = d.decl.Type.TypeParams.NumFields() != 0 && !hasTParamError && check.verifyVersionf(d.decl.Type.TypeParams.List[0], go1_18, "type parameter")
info := &declInfo{file: fileScope, fdecl: d.decl}
// Methods are not package-level objects but we still track them in the
// object map so that we can handle them like regular functions (if the
Expand Down
6 changes: 3 additions & 3 deletions src/go/types/typeset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ func computeInterfaceTypeSet(check *Checker, pos token.Pos, ityp *Interface) *_T
assert(!isTypeParam(typ))
tset := computeInterfaceTypeSet(check, pos, u)
// If typ is local, an error was already reported where typ is specified/defined.
if check != nil && check.isImportedConstraint(typ) && !check.verifyVersionf(check.pkg, atPos(pos), go1_18, "embedding constraint interface %s", typ) {
if check != nil && check.isImportedConstraint(typ) && !check.verifyVersionf(atPos(pos), go1_18, "embedding constraint interface %s", typ) {
continue
}
comparable = tset.comparable
Expand All @@ -285,7 +285,7 @@ func computeInterfaceTypeSet(check *Checker, pos token.Pos, ityp *Interface) *_T
}
terms = tset.terms
case *Union:
if check != nil && !check.verifyVersionf(check.pkg, atPos(pos), go1_18, "embedding interface element %s", u) {
if check != nil && !check.verifyVersionf(atPos(pos), go1_18, "embedding interface element %s", u) {
continue
}
tset := computeUnionTypeSet(check, unionSets, pos, u)
Expand All @@ -299,7 +299,7 @@ func computeInterfaceTypeSet(check *Checker, pos token.Pos, ityp *Interface) *_T
if u == Typ[Invalid] {
continue
}
if check != nil && !check.verifyVersionf(check.pkg, atPos(pos), go1_18, "embedding non-interface type %s", typ) {
if check != nil && !check.verifyVersionf(atPos(pos), go1_18, "embedding non-interface type %s", typ) {
continue
}
terms = termlist{{false, typ}}
Expand Down
4 changes: 2 additions & 2 deletions src/go/types/typexpr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func (check *Checker) ident(x *operand, e *ast.Ident, def *Named, wantType bool)
}
return
case universeAny, universeComparable:
if !check.verifyVersionf(check.pkg, e, go1_18, "predeclared %s", e.Name) {
if !check.verifyVersionf(e, go1_18, "predeclared %s", e.Name) {
return // avoid follow-on errors
}
}
Expand Down Expand Up @@ -272,7 +272,7 @@ func (check *Checker) typInternal(e0 ast.Expr, def *Named) (T Type) {

case *ast.IndexExpr, *ast.IndexListExpr:
ix := typeparams.UnpackIndexExpr(e)
check.verifyVersionf(check.pkg, inNode(e, ix.Lbrack), go1_18, "type instantiation")
check.verifyVersionf(inNode(e, ix.Lbrack), go1_18, "type instantiation")
return check.instantiatedType(ix, def)

case *ast.ParenExpr:
Expand Down
Loading

0 comments on commit 1dad7ef

Please sign in to comment.