From 5d7477249ba074bbdc9ffbf80314397dbe90e886 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Fri, 26 Jan 2018 12:40:31 +0100
Subject: prog: remove unused UnionArg.OptionType

---
 prog/encoding.go   | 4 ++--
 prog/mutation.go   | 2 +-
 prog/prog.go       | 9 ++++-----
 prog/rand.go       | 2 +-
 prog/validation.go | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'prog')

diff --git a/prog/encoding.go b/prog/encoding.go
index 98aa8ff37..b60726c9c 100644
--- a/prog/encoding.go
+++ b/prog/encoding.go
@@ -109,7 +109,7 @@ func serialize(arg Arg, buf *bytes.Buffer, vars map[Arg]int, varSeq *int) {
 		}
 		buf.Write([]byte{delims[1]})
 	case *UnionArg:
-		fmt.Fprintf(buf, "@%v=", a.OptionType.FieldName())
+		fmt.Fprintf(buf, "@%v=", a.Option.Type().FieldName())
 		serialize(a.Option, buf, vars, varSeq)
 	case *ResultArg:
 		if a.Res == nil {
@@ -396,7 +396,7 @@ func (target *Target) parseArg(typ Type, p *parser, vars map[string]Arg) (Arg, e
 		if err != nil {
 			return nil, err
 		}
-		arg = MakeUnionArg(typ, opt, optType)
+		arg = MakeUnionArg(typ, opt)
 	case 'n':
 		p.Parse('n')
 		p.Parse('i')
diff --git a/prog/mutation.go b/prog/mutation.go
index 7a401c854..910f2597f 100644
--- a/prog/mutation.go
+++ b/prog/mutation.go
@@ -212,7 +212,7 @@ func (p *Prog) Mutate(rs rand.Source, ncalls int, ct *ChoiceTable, corpus []*Pro
 					optType := t.Fields[newIdx]
 					p.removeArg(c, a.Option)
 					opt, calls := r.generateArg(s, optType)
-					arg1 := MakeUnionArg(t, opt, optType)
+					arg1 := MakeUnionArg(t, opt)
 					p.replaceArg(c, arg, arg1, calls)
 				case *CsumType:
 					panic("bad arg returned by mutationArgs: CsumType")
diff --git a/prog/prog.go b/prog/prog.go
index a323bafa3..7fb6cf2ff 100644
--- a/prog/prog.go
+++ b/prog/prog.go
@@ -192,12 +192,11 @@ func (arg *GroupArg) Size() uint64 {
 // Used for UnionType.
 type UnionArg struct {
 	ArgCommon
-	Option     Arg
-	OptionType Type
+	Option Arg
 }
 
-func MakeUnionArg(t Type, opt Arg, typ Type) Arg {
-	return &UnionArg{ArgCommon: ArgCommon{typ: t}, Option: opt, OptionType: typ}
+func MakeUnionArg(t Type, opt Arg) Arg {
+	return &UnionArg{ArgCommon: ArgCommon{typ: t}, Option: opt}
 }
 
 func (arg *UnionArg) Size() uint64 {
@@ -315,7 +314,7 @@ func defaultArg(t Type) Arg {
 		}
 		return MakeGroupArg(t, inner)
 	case *UnionType:
-		return MakeUnionArg(t, defaultArg(typ.Fields[0]), typ.Fields[0])
+		return MakeUnionArg(t, defaultArg(typ.Fields[0]))
 	case *VmaType:
 		return MakePointerArg(t, 0, 0, 1, nil)
 	case *PtrType:
diff --git a/prog/rand.go b/prog/rand.go
index f4071eafa..d403a4f96 100644
--- a/prog/rand.go
+++ b/prog/rand.go
@@ -676,7 +676,7 @@ func (r *randGen) generateArg(s *state, typ Type) (arg Arg, calls []*Call) {
 	case *UnionType:
 		optType := a.Fields[r.Intn(len(a.Fields))]
 		opt, calls := r.generateArg(s, optType)
-		return MakeUnionArg(a, opt, optType), calls
+		return MakeUnionArg(a, opt), calls
 	case *PtrType:
 		inner, calls := r.generateArg(s, a.Type)
 		if a.Type.Name() == "iocb" && len(s.resources["iocbptr"]) != 0 {
diff --git a/prog/validation.go b/prog/validation.go
index 2b0fb984c..3ed9eabc2 100644
--- a/prog/validation.go
+++ b/prog/validation.go
@@ -223,7 +223,7 @@ func (c *Call) validate(ctx *validCtx) error {
 			}
 			found := false
 			for _, typ2 := range typ1.Fields {
-				if a.OptionType.Name() == typ2.Name() {
+				if a.Option.Type().Name() == typ2.Name() {
 					found = true
 					break
 				}
-- 
cgit mrf-deployment