[compiler-rt] ff77c4e - [libFuzzer] Add missing argument to CrashResistantMerge.

[Matt Morehouse via llvm-commits]

Author: Matt Morehouse
Date: 2021-09-08T11:48:33-07:00
New Revision: ff77c4eac79c0c1e4d49ec32a88d0e8c0b24abd7

URL: https://github.com/llvm/llvm-project/commit/ff77c4eac79c0c1e4d49ec32a88d0e8c0b24abd7
DIFF: https://github.com/llvm/llvm-project/commit/ff77c4eac79c0c1e4d49ec32a88d0e8c0b24abd7.diff

LOG: [libFuzzer] Add missing argument to CrashResistantMerge.

Fixes a build error caused by a bad merge conflict resolution for
https://reviews.llvm.org/D105084.

Added: 
    

Modified: 
    compiler-rt/lib/fuzzer/FuzzerFork.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/fuzzer/FuzzerFork.cpp b/compiler-rt/lib/fuzzer/FuzzerFork.cpp
index eb68b72f4748..d59d51384201 100644
--- a/compiler-rt/lib/fuzzer/FuzzerFork.cpp
+++ b/compiler-rt/lib/fuzzer/FuzzerFork.cpp
@@ -410,7 +410,7 @@ void FuzzWithFork(Random &Rand, const FuzzingOptions &Options,
       Env.FilesSizes.clear();
       CrashResistantMerge(Env.Args, {}, CurrentSeedFiles, &Env.Files,
                           TmpFeatures, &TmpNewFeatures, TmpCov, &TmpNewCov,
-                          CFPath, false);
+                          CFPath, /*Verbose=*/false, /*IsSetCoverMerge=*/false);
       for (auto &path : Env.Files)
         Env.FilesSizes.push_back(FileSize(path));
       RemoveFile(CFPath);