Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions compiler-rt/lib/fuzzer/FuzzerCorpus.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "FuzzerSHA1.h"
#include "FuzzerTracePC.h"
#include <algorithm>
#include <bitset>
#include <chrono>
#include <numeric>
#include <random>
Expand Down Expand Up @@ -382,6 +383,7 @@ class InputCorpus {
}

// Remove most abundant rare feature.
IsRareFeature[Delete] = false;
RareFeatures[Delete] = RareFeatures.back();
RareFeatures.pop_back();

Expand All @@ -397,6 +399,7 @@ class InputCorpus {

// Add rare feature, handle collisions, and update energy.
RareFeatures.push_back(Idx);
IsRareFeature[Idx] = true;
GlobalFeatureFreqs[Idx] = 0;
for (auto II : Inputs) {
II->DeleteFeatureFreq(Idx);
Expand Down Expand Up @@ -450,9 +453,7 @@ class InputCorpus {
uint16_t Freq = GlobalFeatureFreqs[Idx32]++;

// Skip if abundant.
if (Freq > FreqOfMostAbundantRareFeature ||
std::find(RareFeatures.begin(), RareFeatures.end(), Idx32) ==
RareFeatures.end())
if (Freq > FreqOfMostAbundantRareFeature || !IsRareFeature[Idx32])
return;

// Update global frequencies.
Expand Down Expand Up @@ -581,6 +582,7 @@ class InputCorpus {
uint16_t FreqOfMostAbundantRareFeature = 0;
uint16_t GlobalFeatureFreqs[kFeatureSetSize] = {};
std::vector<uint32_t> RareFeatures;
std::bitset<kFeatureSetSize> IsRareFeature;

std::string OutputCorpus;
};
Expand Down