summaryrefslogtreecommitdiff
path: root/lib/fuzzer/FuzzerMerge.cpp
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2019-02-15 01:22:00 +0000
committerKostya Serebryany <kcc@google.com>2019-02-15 01:22:00 +0000
commit3bca84ff3f580ed8f9724218fc9bff83c442f7a1 (patch)
treed69408e666d3017a4cb5a0520ceedbaaa8e8de3a /lib/fuzzer/FuzzerMerge.cpp
parent459210eed41fa9d37af2cb490161f73f64f4e632 (diff)
downloadcompiler-rt-3bca84ff3f580ed8f9724218fc9bff83c442f7a1.tar.gz
[libFuzzer] print new functions as they are discovered in the fork mode
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@354092 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/fuzzer/FuzzerMerge.cpp')
-rw-r--r--lib/fuzzer/FuzzerMerge.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/fuzzer/FuzzerMerge.cpp b/lib/fuzzer/FuzzerMerge.cpp
index 870a87522..d70aa3e90 100644
--- a/lib/fuzzer/FuzzerMerge.cpp
+++ b/lib/fuzzer/FuzzerMerge.cpp
@@ -100,7 +100,7 @@ bool Merger::Parse(std::istream &IS, bool ParseCoverage) {
LastSeenStartMarker = kInvalidStartMarker;
if (ParseCoverage) {
TmpFeatures.clear(); // use a vector from outer scope to avoid resizes.
- while (ISS1 >> std::hex >> N)
+ while (ISS1 >> N)
TmpFeatures.push_back(N);
std::sort(TmpFeatures.begin(), TmpFeatures.end());
Files[CurrentFileIdx].Features = TmpFeatures;
@@ -108,7 +108,7 @@ bool Merger::Parse(std::istream &IS, bool ParseCoverage) {
} else if (Marker == "COV") {
size_t CurrentFileIdx = N;
if (ParseCoverage)
- while (ISS1 >> std::hex >> N)
+ while (ISS1 >> N)
if (PCs.insert(N).second)
Files[CurrentFileIdx].Cov.push_back(N);
} else {
@@ -220,7 +220,7 @@ void Fuzzer::CrashResistantMergeInternalStep(const std::string &CFPath) {
}
std::ostringstream StartedLine;
// Write the pre-run marker.
- OF << "STARTED " << std::dec << i << " " << U.size() << "\n";
+ OF << "STARTED " << i << " " << U.size() << "\n";
OF.flush(); // Flush is important since Command::Execute may crash.
// Run.
TPC.ResetMaps();
@@ -242,9 +242,9 @@ void Fuzzer::CrashResistantMergeInternalStep(const std::string &CFPath) {
// Write the post-run marker and the coverage.
OF << "FT " << i;
for (size_t F : UniqFeatures)
- OF << " " << std::hex << F;
+ OF << " " << F;
OF << "\n";
- OF << "COV " << std::dec << i;
+ OF << "COV " << i;
TPC.ForEachObservedPC([&](const TracePC::PCTableEntry *TE) {
if (AllPCs.insert(TE).second)
OF << " " << TPC.PCTableEntryIdx(TE);