From e54e9781a4e043b3140b0c908ba4f4e469fd317e Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sun, 26 Apr 2020 14:14:14 +0200 Subject: prog: remove Dir from Type Having Dir is Type is handy, but forces us to duplicate lots of types. E.g. if a struct is referenced as both in and out, then we need to have 2 copies and 2 copies of structs/types it includes. If also prevents us from having the struct type as struct identity (because we can have up to 3 of them). Revert to the old way we used to do it: propagate Dir as we walk syscall arguments. This moves lots of dir passing from pkg/compiler to prog package. Now Arg contains the dir, so once we build the tree, we can use dirs as before. Reduces size of sys/linux/gen/amd64.go from 6058336 to 5661150 (-6.6%). Update #1580 --- prog/minimization.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'prog/minimization.go') diff --git a/prog/minimization.go b/prog/minimization.go index 93a986556..0b5bb05b2 100644 --- a/prog/minimization.go +++ b/prog/minimization.go @@ -137,7 +137,7 @@ func (typ *PtrType) minimize(ctx *minimizeArgsCtx, arg Arg, path string) bool { } if !ctx.triedPaths[path+"->"] { removeArg(a.Res) - replaceArg(a, MakeSpecialPointerArg(a.Type(), 0)) + replaceArg(a, MakeSpecialPointerArg(a.Type(), a.Dir(), 0)) ctx.target.assignSizesCall(ctx.call) if ctx.pred(ctx.p, ctx.callIndex0) { *ctx.p0 = ctx.p @@ -201,7 +201,7 @@ func minimizeInt(ctx *minimizeArgsCtx, arg Arg, path string) bool { return false } a := arg.(*ConstArg) - def := arg.Type().DefaultArg().(*ConstArg) + def := arg.Type().DefaultArg(arg.Dir()).(*ConstArg) if a.Val == def.Val { return false } @@ -239,7 +239,7 @@ func (typ *ResourceType) minimize(ctx *minimizeArgsCtx, arg Arg, path string) bo func (typ *BufferType) minimize(ctx *minimizeArgsCtx, arg Arg, path string) bool { // TODO: try to set individual bytes to 0 - if typ.Kind != BufferBlobRand && typ.Kind != BufferBlobRange || typ.Dir() == DirOut { + if typ.Kind != BufferBlobRand && typ.Kind != BufferBlobRange || arg.Dir() == DirOut { return false } a := arg.(*DataArg) -- cgit mrf-deployment