From 9f87943424df86e501175e10e5e3b8b00dfd03d7 Mon Sep 17 00:00:00 2001 From: Rob Findley Date: Mon, 19 Apr 2021 19:10:09 -0400 Subject: [PATCH] go/types: fix panic when using multiple type arguments Fix a panic caused by using type arguments without first unpacking. This was noticed in the review of CL 300998, but unfortunately not yet fixed. Fixes #45635 Change-Id: I8ab1720f3e27a6002bc925f0eea943ec6f778341 Reviewed-on: https://go-review.googlesource.com/c/go/+/311669 Trust: Robert Findley Run-TryBot: Robert Findley Reviewed-by: Robert Griesemer TryBot-Result: Go Bot --- src/go/types/expr.go | 3 ++- src/go/types/fixedbugs/issue45635.go2 | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/go/types/fixedbugs/issue45635.go2 diff --git a/src/go/types/expr.go b/src/go/types/expr.go index 170761afb3..5576c43819 100644 --- a/src/go/types/expr.go +++ b/src/go/types/expr.go @@ -10,6 +10,7 @@ import ( "fmt" "go/ast" "go/constant" + "go/internal/typeparams" "go/token" "math" ) @@ -1435,7 +1436,7 @@ func (check *Checker) exprInternal(x *operand, e ast.Expr, hint Type) exprKind { case *ast.IndexExpr: check.exprOrType(x, e.X) if x.mode == invalid { - check.use(e.Index) + check.use(typeparams.UnpackExpr(e.Index)...) goto Error } diff --git a/src/go/types/fixedbugs/issue45635.go2 b/src/go/types/fixedbugs/issue45635.go2 new file mode 100644 index 0000000000..1fbe0382ea --- /dev/null +++ b/src/go/types/fixedbugs/issue45635.go2 @@ -0,0 +1,9 @@ +// Copyright 2021 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package main + +func main() { + some /* ERROR "undeclared name" */ [int, int]() +} -- 2.50.0