cla-nit

Author: scott-cotton

.github/ISSUE_TEMPLATE/cla.md

@@ -0,0 +1,15 @@
+---
+name: CLA
+about: request to grant rights to project of your contributions.
+title: '[cla] request'
+labels: cla
+assignees: ''
+
+---
+
+This issue requests to add the following line to the AUTHORS file,
+granting copyright of the individual or organisation to the AUTHORS
+of this project.
+
+[Org or '-']  Name <mail>
+

.github/ISSUE_TEMPLATE/request-for-authorship--cal-.md

@@ -199,7 +199,7 @@ func (mod *Model) p_add(gp *GenParams, p, r Loc, sum *int) Loc {
 	switch gp.ts.Kind(gp.typ) {
 	// these are added as pointers here indirect associattions (params,
 	// returns, ...) are done in github.com/go-air/objects.Builder
-	case typeset.Basic, typeset.Func, typeset.Pointer, typeset.Interface:
+	case typeset.Basic, typeset.Pointer, typeset.Interface:
 		mod.locs = append(mod.locs, l)
 		*sum++
 	case typeset.Slice, typeset.Chan, typeset.Map:
@@ -239,6 +239,26 @@ func (mod *Model) p_add(gp *GenParams, p, r Loc, sum *int) Loc {
 		gp.typ = gp.ts.Underlying(gp.typ)
 		mod.p_add(gp, p, r, sum)
 		added = false
+	case typeset.Func:
+		mod.locs = append(mod.locs, l)
+		*sum++
+		fty := gp.typ
+		rcvty := gp.ts.Recv(fty)
+		if rcvty != typeset.NoType {
+			gp.typ = rcvty
+			mod.p_add(gp, n, r, sum)
+		}
+
+		np := gp.ts.NumParams(fty)
+		for i := 0; i < np; i++ {
+			_, gp.typ = gp.ts.Param(fty, i)
+			mod.p_add(gp, n, r, sum)
+		}
+		nr := gp.ts.NumResults(fty)
+		for i := 0; i < nr; i++ {
+			_, gp.typ = gp.ts.Result(fty, i)
+			mod.p_add(gp, n, r, sum)
+		}
 
 	default:
 		panic(fmt.Sprintf("%d: unexpected/unimplemented", gp.typ))

memory/model.go

@@ -187,7 +187,9 @@ func (b *Builder) Pointer(gtype *types.Pointer) *Pointer {
 func (b *Builder) Func(sig *types.Signature, declName string, opaque memory.Attrs) *Func {
 	fn := &Func{declName: declName}
 	fn.typ = b.ts.FromGoType(sig)
-	fn.loc = b.Type(fn.typ).Gen()
+	_, fn.loc = b.Type(fn.typ).WithPointer()
+
+	b.mmod.AddAddressOf(fn.loc, fn.loc)
 
 	fn.params = make([]memory.Loc, sig.Params().Len())
 	fn.variadic = sig.Variadic()
@@ -196,29 +198,30 @@ func (b *Builder) Func(sig *types.Signature, declName string, opaque memory.Attr
 	b.Class(memory.Local) // for all params and returns
 
 	recv := sig.Recv()
+	var obj memory.Loc
 
 	if recv != nil {
 		b.mgp.Type(b.ts.FromGoType(recv.Type()))
-		fn.recv = b.mmod.Gen(b.mgp)
-		b.walkObj(fn.recv)
+		obj, fn.recv = b.mmod.WithPointer(b.mgp)
+		b.walkObj(obj)
 	}
 	params := sig.Params()
 	N := params.Len()
 	for i := 0; i < N; i++ {
 		param := params.At(i)
 		pty := b.ts.FromGoType(param.Type().Underlying())
-		fn.params[i] =
-			b.Pos(param.Pos()).Type(pty).Attrs(memory.IsParam | opaque).Gen()
-		b.walkObj(fn.params[i])
+		obj, fn.params[i] =
+			b.Pos(param.Pos()).Type(pty).Attrs(memory.IsParam | opaque).WithPointer()
+		b.walkObj(obj)
 	}
 	rets := sig.Results()
 	N = rets.Len()
 	for i := 0; i < N; i++ {
 		ret := rets.At(i)
 		rty := b.ts.FromGoType(ret.Type())
-		fn.results[i] =
-			b.Pos(ret.Pos()).Type(rty).Attrs(memory.IsReturn | opaque).Gen()
-		b.walkObj(fn.results[i])
+		obj, fn.results[i] =
+			b.Pos(ret.Pos()).Type(rty).Attrs(memory.IsReturn | opaque).WithPointer()
+		b.walkObj(obj)
 	}
 	// TBD: FreeVars
 	b.omap[fn.loc] = fn