languages/go
languages/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-07-21 01:55:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmd/compile: fix false positives in isGoConst

Browse source 
isGoConst could spuriously return true for variables that shadow a
constant declaration with the same name.

Because even named constants are always represented by OLITERAL nodes,
the easy fix is to just ignore ONAME nodes in isGoConst. We can
similarly ignore ONONAME nodes.

Confirmed that k8s.io/kubernetes/test/e2e/storage builds again with
this fix.

Fixes #30430.

Change-Id: I899400d749982d341dc248a7cd5a18277c2795ec
Reviewed-on: https://go-review.googlesource.com/c/164319
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>
This commit is contained in:
Matthew Dempsky 2019-02-27 17:12:23 -08:00
parent b47f31f68c
commit 7fa195c1b9
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/cmd/compile/internal/gc/const.go
View file

@ -1280,8 +1280,6 @@ func indexconst(n *Node) int64 {
//
// Expressions derived from nil, like string([]byte(nil)), while they
// may be known at compile time, are not Go language constants.
// Only called for expressions known to evaluate to compile-time
// constants.
func (n *Node) isGoConst() bool {
if n.Orig != nil {
n = n.Orig
@ -1359,17 +1357,6 @@ func (n *Node) isGoConst() bool {
return true
}
case ONAME:
l := asNode(n.Sym.Def)
if l != nil && l.Op == OLITERAL && n.Val().Ctype() != CTNIL {
return true
}
case ONONAME:
if asNode(n.Sym.Def) != nil && asNode(n.Sym.Def).Op == OIOTA {
return true
}
case OALIGNOF, OOFFSETOF, OSIZEOF:
return true
}

17
test/fixedbugs/issue30430.go Normal file
View file

@ -0,0 +1,17 @@
// compile
// Copyright 2019 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.
// Issue 30430: isGoConst returned true for non-const variables,
// resulting in ICE.
package p
func f() {
var s string
_ = map[string]string{s: ""}
}
const s = ""