commit 95a78ad9315c951e42fab86d01c722d1e3135176
author kcc <kcc> Fri Feb 15 00:15:13 2019 +0000
committer kcc <kcc> Fri Feb 15 00:15:13 2019 +0000
tree e2d23e4754368ac7f082663628b469151c71e162
parent 98a8624429907ab017bc8c00178ece606f578b32

[libFuzzer] fix the unit tests

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

FuzzerMerge.cpp

diff --git a/FuzzerMerge.cpp b/FuzzerMerge.cpp
index 549d180..870a875 100644
--- a/FuzzerMerge.cpp
+++ b/FuzzerMerge.cpp
@@ -131,9 +131,10 @@
 
 // Decides which files need to be merged (add those to NewFiles).
 // Returns the number of new features added.
-void Merger::Merge(const Set<uint32_t> &InitialFeatures,
-                   Set<uint32_t> *NewFeatures, const Set<uint32_t> &InitialCov,
-                   Set<uint32_t> *NewCov, Vector<std::string> *NewFiles) {
+size_t Merger::Merge(const Set<uint32_t> &InitialFeatures,
+                     Set<uint32_t> *NewFeatures,
+                     const Set<uint32_t> &InitialCov, Set<uint32_t> *NewCov,
+                     Vector<std::string> *NewFiles) {
   NewFiles->clear();
   assert(NumFilesInFirstCorpus <= Files.size());
   Set<uint32_t> AllFeatures = InitialFeatures;
@@ -181,6 +182,7 @@
       if (InitialCov.find(Cov) == InitialCov.end())
         NewCov->insert(Cov);
   }
+  return NewFeatures->size();
 }
 
 Set<uint32_t> Merger::AllFeatures() const {