From 8bbf94ce31b652c168de6ea784942b54ea09e80c Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Mon, 27 May 2024 14:23:08 +0200 Subject: prog: make minimization parameters explicit Add an explicit parameter to only run call removal. --- pkg/csource/csource_test.go | 2 +- pkg/fuzzer/job.go | 2 +- pkg/repro/repro.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg') diff --git a/pkg/csource/csource_test.go b/pkg/csource/csource_test.go index 86f18af39..7d67927a3 100644 --- a/pkg/csource/csource_test.go +++ b/pkg/csource/csource_test.go @@ -91,7 +91,7 @@ func testTarget(t *testing.T, target *prog.Target, full bool) { opts = allOptionsSingle(target.OS) opts = append(opts, ExecutorOpts) } else { - minimized, _ := prog.Minimize(syzProg, -1, false, func(p *prog.Prog, call int) bool { + minimized, _ := prog.Minimize(syzProg, -1, prog.MinimizeParams{}, func(p *prog.Prog, call int) bool { return len(p.Calls) == len(syzProg.Calls) }) p.Calls = append(p.Calls, minimized.Calls...) diff --git a/pkg/fuzzer/job.go b/pkg/fuzzer/job.go index dd3dc4a1a..00c7c034b 100644 --- a/pkg/fuzzer/job.go +++ b/pkg/fuzzer/job.go @@ -194,7 +194,7 @@ func (job *triageJob) deflake(exec func(*queue.Request, ProgTypes) *queue.Result func (job *triageJob) minimize(newSignal signal.Signal) (stop bool) { const minimizeAttempts = 3 - job.p, job.call = prog.Minimize(job.p, job.call, false, + job.p, job.call = prog.Minimize(job.p, job.call, prog.MinimizeParams{}, func(p1 *prog.Prog, call1 int) bool { if stop { return false diff --git a/pkg/repro/repro.go b/pkg/repro/repro.go index 68d67f11b..67fac3811 100644 --- a/pkg/repro/repro.go +++ b/pkg/repro/repro.go @@ -412,7 +412,7 @@ func (ctx *context) minimizeProg(res *Result) (*Result, error) { ctx.stats.MinimizeProgTime = time.Since(start) }() - res.Prog, _ = prog.Minimize(res.Prog, -1, true, + res.Prog, _ = prog.Minimize(res.Prog, -1, prog.MinimizeParams{Light: true}, func(p1 *prog.Prog, callIndex int) bool { crashed, err := ctx.testProg(p1, res.Duration, res.Opts) if err != nil { -- cgit mrf-deployment