Commit 55c0ad4b authored by Cuong Manh Le's avatar Cuong Manh Le Committed by Matthew Dempsky

cmd/compile: allow iota inside function in a ConstSpec

Fixes #22344

Change-Id: I7c400d9d4ebcab279d08a8c190508d82cbd20899
Reviewed-on: https://go-review.googlesource.com/c/go/+/194717
Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarMatthew Dempsky <mdempsky@google.com>
parent 88076ebc
...@@ -73,6 +73,12 @@ func (p *noder) funcLit(expr *syntax.FuncLit) *Node { ...@@ -73,6 +73,12 @@ func (p *noder) funcLit(expr *syntax.FuncLit) *Node {
func typecheckclosure(clo *Node, top int) { func typecheckclosure(clo *Node, top int) {
xfunc := clo.Func.Closure xfunc := clo.Func.Closure
// Set current associated iota value, so iota can be used inside
// function in ConstSpec, see issue #22344
if x := getIotaValue(); x >= 0 {
xfunc.SetIota(x)
}
clo.Func.Ntype = typecheck(clo.Func.Ntype, ctxType) clo.Func.Ntype = typecheck(clo.Func.Ntype, ctxType)
clo.Type = clo.Func.Ntype.Type clo.Type = clo.Func.Ntype.Type
clo.Func.Top = top clo.Func.Top = top
......
...@@ -48,6 +48,7 @@ type Node struct { ...@@ -48,6 +48,7 @@ type Node struct {
// - OSTRUCTKEY uses it to store the named field's offset. // - OSTRUCTKEY uses it to store the named field's offset.
// - Named OLITERALs use it to store their ambient iota value. // - Named OLITERALs use it to store their ambient iota value.
// - OINLMARK stores an index into the inlTree data structure. // - OINLMARK stores an index into the inlTree data structure.
// - OCLOSURE uses it to store ambient iota value, if any.
// Possibly still more uses. If you find any, document them. // Possibly still more uses. If you find any, document them.
Xoffset int64 Xoffset int64
......
...@@ -100,10 +100,8 @@ func resolve(n *Node) (res *Node) { ...@@ -100,10 +100,8 @@ func resolve(n *Node) (res *Node) {
} }
if r.Op == OIOTA { if r.Op == OIOTA {
if i := len(typecheckdefstack); i > 0 { if x := getIotaValue(); x >= 0 {
if x := typecheckdefstack[i-1]; x.Op == OLITERAL { return nodintconst(x)
return nodintconst(x.Iota())
}
} }
return n return n
} }
...@@ -3935,3 +3933,19 @@ func setTypeNode(n *Node, t *types.Type) { ...@@ -3935,3 +3933,19 @@ func setTypeNode(n *Node, t *types.Type) {
n.Type = t n.Type = t
n.Type.Nod = asTypesNode(n) n.Type.Nod = asTypesNode(n)
} }
// getIotaValue returns the current value for "iota",
// or -1 if not within a ConstSpec.
func getIotaValue() int64 {
if i := len(typecheckdefstack); i > 0 {
if x := typecheckdefstack[i-1]; x.Op == OLITERAL {
return x.Iota()
}
}
if Curfn != nil && Curfn.Iota() >= 0 {
return Curfn.Iota()
}
return -1
}
// 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.
// Test iota inside a function in a ConstSpec is accepted
package main
import (
"unsafe"
)
// iotas are usable inside closures in constant declarations (#22345)
const (
_ = iota
_ = len([iota]byte{})
_ = unsafe.Sizeof(iota)
_ = unsafe.Sizeof(func() { _ = iota })
_ = unsafe.Sizeof(func() { var _ = iota })
_ = unsafe.Sizeof(func() { const _ = iota })
_ = unsafe.Sizeof(func() { type _ [iota]byte })
_ = unsafe.Sizeof(func() { func() int { return iota }() })
)
// verify inner and outer const declarations have distinct iotas
const (
zero = iota
one = iota
_ = unsafe.Sizeof(func() {
var x [iota]int // [2]int
var y [iota]int // [2]int
const (
Zero = iota
One
Two
_ = unsafe.Sizeof([iota - 1]int{} == x) // assert types are equal
_ = unsafe.Sizeof([iota - 2]int{} == y) // assert types are equal
_ = unsafe.Sizeof([Two]int{} == x) // assert types are equal
)
var z [iota]int // [2]int
_ = unsafe.Sizeof([2]int{} == z) // assert types are equal
})
three = iota // the sequence continues
)
var _ [three]int = [3]int{} // assert 'three' has correct value
func main() {
const (
_ = iota
_ = len([iota]byte{})
_ = unsafe.Sizeof(iota)
_ = unsafe.Sizeof(func() { _ = iota })
_ = unsafe.Sizeof(func() { var _ = iota })
_ = unsafe.Sizeof(func() { const _ = iota })
_ = unsafe.Sizeof(func() { type _ [iota]byte })
_ = unsafe.Sizeof(func() { func() int { return iota }() })
)
const (
zero = iota
one = iota
_ = unsafe.Sizeof(func() {
var x [iota]int // [2]int
var y [iota]int // [2]int
const (
Zero = iota
One
Two
_ = unsafe.Sizeof([iota - 1]int{} == x) // assert types are equal
_ = unsafe.Sizeof([iota - 2]int{} == y) // assert types are equal
_ = unsafe.Sizeof([Two]int{} == x) // assert types are equal
)
var z [iota]int // [2]int
_ = unsafe.Sizeof([2]int{} == z) // assert types are equal
})
three = iota // the sequence continues
)
var _ [three]int = [3]int{} // assert 'three' has correct value
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment