diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-02-24 17:00:34 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-02-24 17:00:34 +0100 |
| commit | 44f66b4026e94ffbb63e7ba1a53f0c5f78a03fea (patch) | |
| tree | cea2c13644374a41f6f70151a233a993bd09f040 /sys/linux | |
| parent | 5c1e02070621f89371ac87c68e0083893a9f9461 (diff) | |
prog: return concrete arg types from Make functions
This removes a bunch of type assertions and makes code type safer.
Diffstat (limited to 'sys/linux')
| -rw-r--r-- | sys/linux/init.go | 10 | ||||
| -rw-r--r-- | sys/linux/init_alg.go | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/linux/init.go b/sys/linux/init.go index d127efbfb..4e04f237b 100644 --- a/sys/linux/init.go +++ b/sys/linux/init.go @@ -259,17 +259,17 @@ func (arch *arch) generateTimespec(g *prog.Gen, typ0 prog.Type, old prog.Arg) (a Ret: prog.MakeReturnArg(meta.Ret), } calls = append(calls, gettime) - sec := prog.MakeResultArg(typ.Fields[0], tp.(*prog.GroupArg).Inner[0], 0) - nsec := prog.MakeResultArg(typ.Fields[1], tp.(*prog.GroupArg).Inner[1], 0) + sec := prog.MakeResultArg(typ.Fields[0], tp.Inner[0], 0) + nsec := prog.MakeResultArg(typ.Fields[1], tp.Inner[1], 0) msec := uint64(10) if g.NOutOf(1, 2) { msec = 30 } if usec { - nsec.(*prog.ResultArg).OpDiv = 1e3 - nsec.(*prog.ResultArg).OpAdd = msec * 1e3 + nsec.OpDiv = 1e3 + nsec.OpAdd = msec * 1e3 } else { - nsec.(*prog.ResultArg).OpAdd = msec * 1e6 + nsec.OpAdd = msec * 1e6 } arg = prog.MakeGroupArg(typ, []prog.Arg{sec, nsec}) } diff --git a/sys/linux/init_alg.go b/sys/linux/init_alg.go index 8b7791f00..4094bb2cd 100644 --- a/sys/linux/init_alg.go +++ b/sys/linux/init_alg.go @@ -18,8 +18,8 @@ func (arch *arch) generateSockaddrAlg(g *prog.Gen, typ0 prog.Type, old prog.Arg) feat := prog.MakeConstArg(typ.Fields[2], 0) mask := prog.MakeConstArg(typ.Fields[3], 0) if g.NOutOf(1, 1000) { - feat = g.GenerateArg(typ.Fields[2], &calls) - mask = g.GenerateArg(typ.Fields[3], &calls) + feat = g.GenerateArg(typ.Fields[2], &calls).(*prog.ConstArg) + mask = g.GenerateArg(typ.Fields[3], &calls).(*prog.ConstArg) } algType, algName := generateAlgName(g.Rand()) // Extend/truncate type/name to their fixed sizes. |