move gotype memory loc generation to objects/builder

Author: scott-cotton

memory/model.go

@@ -52,6 +52,8 @@ func NewModel(index indexing.T) *Model {
 	z.class = Zero
 	z.parent = zz
 	z.root = zz
+	z.obj = z
+	res.AddPointsTo(z, z)
 	return res
 }
 

objects/builder.go

@@ -15,6 +15,7 @@
 package objects
 
 import (
+	"fmt"
 	"go/token"
 	"go/types"
 
@@ -228,6 +229,38 @@ func (b *Builder) Func(sig *types.Signature, declName string, opaque memory.Attr
 	return fn
 }
 
+func (b *Builder) FromGoType(gt types.Type) memory.Loc {
+	var res memory.Loc
+	switch ty := gt.Underlying().(type) {
+	case *types.Tuple:
+		res = b.Tuple(ty).Loc()
+	case *types.Struct:
+		res = b.Struct(ty).Loc()
+	case *types.Array:
+		res = b.Array(ty).Loc()
+	case *types.Slice:
+		res = b.Slice(ty, nil, nil).Loc()
+	case *types.Map:
+		res = b.Map(ty).Loc()
+	case *types.Signature:
+		res = b.Func(ty, "", memory.NoAttrs).Loc()
+	case *types.Pointer:
+		res = b.Pointer(ty).Loc()
+	case *types.Chan:
+		res = b.Chan(ty).Loc()
+	case *types.Basic:
+		res = b.Gen()
+	case *types.Interface:
+		res = b.Gen()
+
+	default:
+		fmt.Printf("genValueLoc: default switch ty: %s\n", ty)
+		res = b.Gen()
+	}
+	return res
+
+}
+
 // second pass to associate objects with all object like memory locations...
 // the input is likely to just create roots at variables, but we need objects
 // everywhere...

objects/func_test.go

@@ -47,5 +47,4 @@ func TestFuncPlain(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-
 }

ssa2pal/t.go

@@ -348,32 +348,7 @@ func (p *T) genValueLoc(v ssa.Value) memory.Loc {
 		p.buildr.AddTransfer(tuple.At(2), m.Elem())
 
 	default:
-		switch ty := v.Type().Underlying().(type) {
-		case *types.Tuple:
-			res = p.buildr.Tuple(ty).Loc()
-		case *types.Struct:
-			res = p.buildr.Struct(ty).Loc()
-		case *types.Array:
-			res = p.buildr.Array(ty).Loc()
-		case *types.Slice:
-			res = p.buildr.Slice(ty, nil, nil).Loc()
-		case *types.Map:
-			res = p.buildr.Map(ty).Loc()
-		case *types.Signature:
-			res = p.buildr.Func(ty, "", memory.NoAttrs).Loc()
-		case *types.Pointer:
-			res = p.buildr.Pointer(ty).Loc()
-		case *types.Chan:
-			res = p.buildr.Chan(ty).Loc()
-		case *types.Basic:
-			res = p.buildr.Gen()
-		case *types.Interface:
-			res = p.buildr.Gen()
-
-		default:
-			fmt.Printf("genValueLoc: default switch ty: %s\n", ty)
-			res = p.buildr.Gen()
-		}
+		res = p.buildr.FromGoType(v.Type())
 
 	}
 	p.vmap[v] = res