commit e5ef7c05fd0382d77afe83765a407b66b54c0a78
author kcc <kcc> Fri Apr 19 01:39:14 2019 +0000
committer kcc <kcc> Fri Apr 19 01:39:14 2019 +0000
tree 20e1495609e05e5fc1b5faa9617c183ea08cf018
parent 39927814a9524a00895dd799467a7322f00bb025

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

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk/lib/fuzzer@358726 91177308-0d34-0410-b5e6-96231b3b80d8

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,