mirror of
https://github.com/golang/go
synced 2024-09-04 23:44:16 +00:00
[dev.typeparams] cmd/compile/internal/types2: use Checker-provided type parameter IDs when possible
This is a port of https://golang.org/cl/317472. For #46003. Change-Id: Ie7b8880d43d459527b981ed4f60ee4d80a3cd17a Reviewed-on: https://go-review.googlesource.com/c/go/+/320149 Trust: Robert Griesemer <gri@golang.org> Run-TryBot: Robert Griesemer <gri@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Robert Findley <rfindley@google.com>
This commit is contained in:
parent
c3fa51c9a2
commit
03ed590e51
|
@ -349,7 +349,6 @@ func TestTypesInfo(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, test := range tests {
|
for _, test := range tests {
|
||||||
ResetId() // avoid renumbering of type parameter ids when adding tests
|
|
||||||
info := Info{Types: make(map[syntax.Expr]TypeAndValue)}
|
info := Info{Types: make(map[syntax.Expr]TypeAndValue)}
|
||||||
var name string
|
var name string
|
||||||
if strings.HasPrefix(test.src, brokenPkg) {
|
if strings.HasPrefix(test.src, brokenPkg) {
|
||||||
|
|
|
@ -83,6 +83,7 @@ type Checker struct {
|
||||||
pkg *Package
|
pkg *Package
|
||||||
*Info
|
*Info
|
||||||
version version // accepted language version
|
version version // accepted language version
|
||||||
|
nextID uint64 // unique Id for type parameters (first valid Id is 1)
|
||||||
objMap map[Object]*declInfo // maps package-level objects and (non-interface) methods to declaration info
|
objMap map[Object]*declInfo // maps package-level objects and (non-interface) methods to declaration info
|
||||||
impMap map[importKey]*Package // maps (import path, source directory) to (complete or fake) package
|
impMap map[importKey]*Package // maps (import path, source directory) to (complete or fake) package
|
||||||
posMap map[*Interface][]syntax.Pos // maps interface types to lists of embedded interface positions
|
posMap map[*Interface][]syntax.Pos // maps interface types to lists of embedded interface positions
|
||||||
|
|
|
@ -732,11 +732,11 @@ func (t *Named) AddMethod(m *Func) {
|
||||||
// Note: This is a uint32 rather than a uint64 because the
|
// Note: This is a uint32 rather than a uint64 because the
|
||||||
// respective 64 bit atomic instructions are not available
|
// respective 64 bit atomic instructions are not available
|
||||||
// on all platforms.
|
// on all platforms.
|
||||||
var lastId uint32
|
var lastID uint32
|
||||||
|
|
||||||
// nextId returns a value increasing monotonically by 1 with
|
// nextID returns a value increasing monotonically by 1 with
|
||||||
// each call, starting with 1. It may be called concurrently.
|
// each call, starting with 1. It may be called concurrently.
|
||||||
func nextId() uint64 { return uint64(atomic.AddUint32(&lastId, 1)) }
|
func nextID() uint64 { return uint64(atomic.AddUint32(&lastID, 1)) }
|
||||||
|
|
||||||
// A TypeParam represents a type parameter type.
|
// A TypeParam represents a type parameter type.
|
||||||
type TypeParam struct {
|
type TypeParam struct {
|
||||||
|
@ -753,7 +753,13 @@ func (t *TypeParam) Obj() *TypeName { return t.obj }
|
||||||
// NewTypeParam returns a new TypeParam.
|
// NewTypeParam returns a new TypeParam.
|
||||||
func (check *Checker) NewTypeParam(obj *TypeName, index int, bound Type) *TypeParam {
|
func (check *Checker) NewTypeParam(obj *TypeName, index int, bound Type) *TypeParam {
|
||||||
assert(bound != nil)
|
assert(bound != nil)
|
||||||
typ := &TypeParam{check: check, id: nextId(), obj: obj, index: index, bound: bound}
|
// Always increment lastID, even if it is not used.
|
||||||
|
id := nextID()
|
||||||
|
if check != nil {
|
||||||
|
check.nextID++
|
||||||
|
id = check.nextID
|
||||||
|
}
|
||||||
|
typ := &TypeParam{check: check, id: id, obj: obj, index: index, bound: bound}
|
||||||
if obj.typ == nil {
|
if obj.typ == nil {
|
||||||
obj.typ = typ
|
obj.typ = typ
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,14 +4,6 @@
|
||||||
|
|
||||||
package types2
|
package types2
|
||||||
|
|
||||||
import "sync/atomic"
|
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
acceptMethodTypeParams = true
|
acceptMethodTypeParams = true
|
||||||
}
|
}
|
||||||
|
|
||||||
// Upon calling ResetId, nextId starts with 1 again.
|
|
||||||
// It may be called concurrently. This is only needed
|
|
||||||
// for tests where we may want to have a consistent
|
|
||||||
// numbering for each individual test case.
|
|
||||||
func ResetId() { atomic.StoreUint32(&lastId, 0) }
|
|
||||||
|
|
Loading…
Reference in a new issue