prog: rename {PtrType,ArrayType}.Type to Elem

Name "Type" is confusing when referring to pointer/array element type.
Frequently there are too many Type/typ/typ1/t and typ.Type is not very informative.
It _is_ a type, but what's usually more relevant is that it's an _element_ type.
Let's leave type checking to compiler and give it a more meaningful name.

3 files changed, 8 insertions, 8 deletions

diff --git a/tools/syz-check/check.go b/tools/syz-check/check.go
index 490a48c3f..45506261a 100644
--- a/tools/syz-check/check.go
+++ b/tools/syz-check/check.go
@@ -510,7 +510,7 @@ func isNetlinkPolicy(typ *prog.StructDesc) bool {
 			continue
 		}
 		if arr, ok := field.(*prog.ArrayType); ok {
-			field = arr.Type
+			field = arr.Elem
 		}
 		if field1, ok := field.(*prog.StructType); ok {
 			if isNetlinkPolicy(field1.StructDesc) {
@@ -629,8 +629,8 @@ func minTypeSize(typ prog.Type) int {
 		return size
 	}
 	if arr, ok := typ.(*prog.ArrayType); ok {
-		if arr.Kind == prog.ArrayRangeLen && !arr.Type.Varlen() {
-			return int(arr.RangeBegin * arr.Type.Size())
+		if arr.Kind == prog.ArrayRangeLen && !arr.Elem.Varlen() {
+			return int(arr.RangeBegin * arr.Elem.Size())
 		}
 	}
 	return -1
diff --git a/tools/syz-trace2syz/proggen/call_selector.go b/tools/syz-trace2syz/proggen/call_selector.go
index 886c82636..4808432a3 100644
--- a/tools/syz-trace2syz/proggen/call_selector.go
+++ b/tools/syz-trace2syz/proggen/call_selector.go
@@ -145,7 +145,7 @@ func (cs *openCallSelector) matchOpen(meta *prog.Syscall, call *parser.Syscall)
 	if _, ok := syzFileArg.(*prog.PtrType); !ok {
 		return false, -1
 	}
-	syzBuf := syzFileArg.(*prog.PtrType).Type.(*prog.BufferType)
+	syzBuf := syzFileArg.(*prog.PtrType).Elem.(*prog.BufferType)
 	if syzBuf.Kind != prog.BufferString {
 		return false, -1
 	}
@@ -228,7 +228,7 @@ func (cs *defaultCallSelector) matchCall(meta *prog.Syscall, call *parser.Syscal
 				return -1
 			}
 		case *prog.PtrType:
-			switch r := t.Type.(type) {
+			switch r := t.Elem.(type) {
 			case *prog.BufferType:
 				matched := false
 				buffer, ok := arg.(*parser.BufferType)
diff --git a/tools/syz-trace2syz/proggen/proggen.go b/tools/syz-trace2syz/proggen/proggen.go
index 1189fe2ac..371050c56 100644
--- a/tools/syz-trace2syz/proggen/proggen.go
+++ b/tools/syz-trace2syz/proggen/proggen.go
@@ -201,7 +201,7 @@ func (ctx *context) genArray(syzType *prog.ArrayType, dir prog.Dir, traceType pa
 	switch a := traceType.(type) {
 	case *parser.GroupType:
 		for i := 0; i < len(a.Elems); i++ {
-			args = append(args, ctx.genArg(syzType.Type, dir, a.Elems[i]))
+			args = append(args, ctx.genArg(syzType.Elem, dir, a.Elems[i]))
 		}
 	default:
 		log.Fatalf("unsupported type for array: %#v", traceType)
@@ -361,10 +361,10 @@ func (ctx *context) genPtr(syzType *prog.PtrType, dir prog.Dir, traceType parser
 			return prog.MakeSpecialPointerArg(syzType, dir, 0)
 		}
 		// Likely have a type of the form bind(3, 0xfffffffff, [3]);
-		res := syzType.Type.DefaultArg(syzType.ElemDir)
+		res := syzType.Elem.DefaultArg(syzType.ElemDir)
 		return ctx.addr(syzType, dir, res.Size(), res)
 	default:
-		res := ctx.genArg(syzType.Type, syzType.ElemDir, a)
+		res := ctx.genArg(syzType.Elem, syzType.ElemDir, a)
 		return ctx.addr(syzType, dir, res.Size(), res)
 	}
 }