]> Cypherpunks repositories - gostls13.git/commitdiff
go/types: fix panic when using multiple type arguments
authorRob Findley <rfindley@google.com>
Mon, 19 Apr 2021 23:10:09 +0000 (19:10 -0400)
committerRobert Findley <rfindley@google.com>
Tue, 20 Apr 2021 00:14:27 +0000 (00:14 +0000)
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 <rfindley@google.com>
Run-TryBot: Robert Findley <rfindley@google.com>
Reviewed-by: Robert Griesemer <gri@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>

src/go/types/expr.go
src/go/types/fixedbugs/issue45635.go2 [new file with mode: 0644]

index 170761afb3747577417b49a749f26980dc404dec..5576c438198deca93e371c009e5ceb7723bda30b 100644 (file)
@@ -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 (file)
index 0000000..1fbe038
--- /dev/null
@@ -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]()
+}