commit ca13db5bfca2656190d41cdae3b4ee84f85f9df8
author Kostya Serebryany <kcc@google.com> Fri Apr 19 01:39:14 2019 +0000
committer Copybara-Service <copybara-worker@google.com> Thu Mar 25 23:19:32 2021 -0700
tree 6dee6c6b9ac54f0fa8e28236a61d5f6827e50459
parent cdfb35e649639a4ce81dd4fb87e75dbe62396d22

[libFuzzer] in fork mode, make sure the child stats are always collected. This should fix the flakiness in fork-ubsan.test

llvm-svn: 358726
GitOrigin-RevId: bbb8522bdeff73488b772bcf71c450559b9d5626

FuzzerFork.cpp

diff --git a/FuzzerFork.cpp b/FuzzerFork.cpp
index 3d85beb..9d338aa 100644
--- a/FuzzerFork.cpp
+++ b/FuzzerFork.cpp
@@ -150,6 +150,9 @@
   }
 
   void RunOneMergeJob(FuzzJob *Job) {
+    auto Stats = ParseFinalStatsFromLog(Job->LogPath);
+    NumRuns += Stats.number_of_executed_units;
+
     Vector<SizedFile> TempFiles, MergeCandidates;
     // Read all newly created inputs and their feature sets.
     // Choose only those inputs that have new features.
@@ -189,8 +192,6 @@
           PrintPC("  NEW_FUNC: %p %F %L\n", "",
                   TPC.GetNextInstructionPc(TE->PC));
 
-    auto Stats = ParseFinalStatsFromLog(Job->LogPath);
-    NumRuns += Stats.number_of_executed_units;
     if (!FilesToAdd.empty() || Job->ExitCode != 0)
       Printf("#%zd: cov: %zd ft: %zd corp: %zd exec/s %zd "
              "oom/timeout/crash: %zd/%zd/%zd time: %zds\n", NumRuns,