Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/compile: add support for generic maps

Browse source 
Add support for maps in subster.typ(). Add new test cases maps.go and set.go.

Change substitution of a TFUNC in subster.typ() to always create new
param and result structs if any of the receiver, param, or result
structs get substituted. All these func structs must be copied, because
they have offset fields that are dependent, and so must have an
independent copy for each new signature (else there will be an error
later when frame offsets are calculated).

Change-Id: I576942a62f06b46b6f005abc98f65533008de8dc
Reviewed-on: https://go-review.googlesource.com/c/go/+/301670
Trust: Dan Scales <danscales@google.com>
Trust: Robert Griesemer <gri@golang.org>
Reviewed-by: Robert Griesemer <gri@golang.org>
This commit is contained in:
Dan Scales 2021-03-14 20:13:05 -07:00
parent dca9c11845
commit c236095638
3 changed files with 572 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/cmd/compile/internal/noder/stencil.go
View file

@ -461,9 +461,11 @@ func (subst *subster) list(l []ir.Node) []ir.Node {
}
// tstruct substitutes type params in types of the fields of a structure type. For
// each field, if Nname is set, tstruct also translates the Nname using subst.vars, if
// Nname is in subst.vars.
func (subst *subster) tstruct(t *types.Type) *types.Type {
// each field, if Nname is set, tstruct also translates the Nname using
// subst.vars, if Nname is in subst.vars. To always force the creation of a new
// (top-level) struct, regardless of whether anything changed with the types or
// names of the struct's fields, set force to true.
func (subst *subster) tstruct(t *types.Type, force bool) *types.Type {
if t.NumFields() == 0 {
if t.HasTParam() {
// For an empty struct, we need to return a new type,
@ -474,6 +476,9 @@ func (subst *subster) tstruct(t *types.Type) *types.Type {
return t
}
var newfields []*types.Field
if force {
newfields = make([]*types.Field, t.NumFields())
}
for i, f := range t.Fields().Slice() {
t2 := subst.typ(f.Type)
if (t2 != f.Type || f.Nname != nil) && newfields == nil {
@ -650,20 +655,33 @@ func (subst *subster) typ(t *types.Type) *types.Type {
}
case types.TSTRUCT:
newt = subst.tstruct(t)
newt = subst.tstruct(t, false)
if newt == t {
newt = nil
}
case types.TFUNC:
newrecvs := subst.tstruct(t.Recvs())
newparams := subst.tstruct(t.Params())
newresults := subst.tstruct(t.Results())
newrecvs := subst.tstruct(t.Recvs(), false)
newparams := subst.tstruct(t.Params(), false)
newresults := subst.tstruct(t.Results(), false)
if newrecvs != t.Recvs() || newparams != t.Params() || newresults != t.Results() {
// If any types have changed, then the all the fields of
// of recv, params, and results must be copied, because they have
// offset fields that are dependent, and so must have an
// independent copy for each new signature.
var newrecv *types.Field
if newrecvs.NumFields() > 0 {
if newrecvs == t.Recvs() {
newrecvs = subst.tstruct(t.Recvs(), true)
}
newrecv = newrecvs.Field(0)
}
if newparams == t.Params() {
newparams = subst.tstruct(t.Params(), true)
}
if newresults == t.Results() {
newresults = subst.tstruct(t.Results(), true)
}
newt = types.NewSignature(t.Pkg(), newrecv, t.TParams().FieldSlice(), newparams.FieldSlice(), newresults.FieldSlice())
}
@ -673,6 +691,13 @@ func (subst *subster) typ(t *types.Type) *types.Type {
newt = nil
}
case types.TMAP:
newkey := subst.typ(t.Key())
newval := subst.typ(t.Elem())
if newkey != t.Key() || newval != t.Elem() {
newt = types.NewMap(newkey, newval)
}
case types.TCHAN:
elem := t.Elem()
newelem := subst.typ(elem)
@ -684,8 +709,6 @@ func (subst *subster) typ(t *types.Type) *types.Type {
types.CheckSize(newt)
}
}
// TODO: case TMAP
}
if newt == nil {
// Even though there were typeparams in the type, there may be no