1 files changed, 9 insertions, 4 deletions
diff --git a/llvm/lib/Fuzzer/FuzzerInternal.h b/llvm/lib/Fuzzer/FuzzerInternal.h
index c7382c9cd6c..4917f125842 100644
--- a/llvm/lib/Fuzzer/FuzzerInternal.h
+++ b/llvm/lib/Fuzzer/FuzzerInternal.h
@@ -19,7 +19,6 @@
 #include <climits>
 #include <cstddef>
 #include <cstdlib>
-#include <memory>
 #include <random>
 #include <string.h>
 #include <string>
@@ -360,8 +359,6 @@ private:
   std::vector<Mutator> DefaultMutators;
 };
 
-class CoverageController;
-
 class Fuzzer {
 public:
 
@@ -488,6 +485,11 @@ private:
   void DumpCurrentUnit(const char *Prefix);
   void DeathCallback();
 
+  void ResetEdgeCoverage();
+  void ResetCounters();
+  void PrepareCounters(Fuzzer::Coverage *C);
+  bool RecordMaxCoverage(Fuzzer::Coverage *C);
+
   void LazyAllocateCurrentUnitData();
   uint8_t *CurrentUnitData = nullptr;
   std::atomic<size_t> CurrentUnitSize;
@@ -513,7 +515,10 @@ private:
 
   // Maximum recorded coverage.
   Coverage MaxCoverage;
-  std::unique_ptr<CoverageController> CController;
+
+  // For -print_new_cov_pcs
+  uintptr_t* PcBuffer = nullptr;
+  size_t PcBufferLen = 0;
 
   // Need to know our own thread.
   static thread_local bool IsMyThread;