From: Cuong Manh Le Date: Fri, 19 Feb 2021 19:40:35 +0000 (+0700) Subject: cmd/compile: do not add invalid key to constSet X-Git-Tag: go1.17beta1~1292 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1d0256a989;p=gostls13.git cmd/compile: do not add invalid key to constSet After CL 272654, the compiler now use go/constant.Value to represent constant nodes. That makes ir.ConstantValue requires node type to correctly return value for untyped int node. But untyped int node can have nil type after typechecked, e.g: using int value as key for map[string]int, that makes the compiler crashes. To fix it, just don't add the invalid key to constSet, since when it's not important to report duplicated keys when they aren't valid. For #43311 Fixes #44432 Change-Id: I44d8f2b95f5cb339e77e8a705a94bcb16e62beb9 Reviewed-on: https://go-review.googlesource.com/c/go/+/294034 Trust: Cuong Manh Le Run-TryBot: Cuong Manh Le TryBot-Result: Go Bot Reviewed-by: Matthew Dempsky --- diff --git a/src/cmd/compile/internal/typecheck/const.go b/src/cmd/compile/internal/typecheck/const.go index c60d36ba62..9b3a27b2d8 100644 --- a/src/cmd/compile/internal/typecheck/const.go +++ b/src/cmd/compile/internal/typecheck/const.go @@ -794,7 +794,7 @@ func (s *constSet) add(pos src.XPos, n ir.Node, what, where string) { } } - if !ir.IsConstNode(n) { + if !ir.IsConstNode(n) || n.Type() == nil { return } if n.Type().IsUntyped() { diff --git a/test/fixedbugs/issue44432.go b/test/fixedbugs/issue44432.go new file mode 100644 index 0000000000..c5fb67e0d7 --- /dev/null +++ b/test/fixedbugs/issue44432.go @@ -0,0 +1,13 @@ +// errorcheck -G=0 -d=panic + +// 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 p + +var m = map[string]int{ + "a": 1, + 1: 1, // ERROR "cannot use 1.*as type string in map key" + 2: 2, // ERROR "cannot use 2.*as type string in map key" +}