[llvm] r281814 - [libFuzzer] properly reset the guards when reseting the coverage. Also try to fix check-fuzzer on the bot
Kostya Serebryany via llvm-commits
llvm-commits at lists.llvm.org
Fri Sep 16 23:01:56 PDT 2016
Author: kcc
Date: Sat Sep 17 01:01:55 2016
New Revision: 281814
URL: http://llvm.org/viewvc/llvm-project?rev=281814&view=rev
Log:
[libFuzzer] properly reset the guards when reseting the coverage. Also try to fix check-fuzzer on the bot
Modified:
llvm/trunk/lib/Fuzzer/FuzzerInternal.h
llvm/trunk/lib/Fuzzer/FuzzerTracePC.cpp
llvm/trunk/lib/Fuzzer/test/trace-pc/CMakeLists.txt
Modified: llvm/trunk/lib/Fuzzer/FuzzerInternal.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/FuzzerInternal.h?rev=281814&r1=281813&r2=281814&view=diff
==============================================================================
--- llvm/trunk/lib/Fuzzer/FuzzerInternal.h (original)
+++ llvm/trunk/lib/Fuzzer/FuzzerInternal.h Sat Sep 17 01:01:55 2016
@@ -380,6 +380,7 @@ class TracePC {
NumNewPCs = 0;
CounterMap.Reset();
TotalCoverageMap.Reset();
+ ResetGuards();
}
void PrintModuleInfo();
@@ -394,6 +395,8 @@ private:
size_t NumNewPCs = 0;
void AddNewPC(uintptr_t PC) { NewPCs[(NumNewPCs++) % kMaxNewPCs] = PC; }
+ void ResetGuards();
+
struct Module {
uint64_t *Start, *Stop;
};
Modified: llvm/trunk/lib/Fuzzer/FuzzerTracePC.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/FuzzerTracePC.cpp?rev=281814&r1=281813&r2=281814&view=diff
==============================================================================
--- llvm/trunk/lib/Fuzzer/FuzzerTracePC.cpp (original)
+++ llvm/trunk/lib/Fuzzer/FuzzerTracePC.cpp Sat Sep 17 01:01:55 2016
@@ -34,6 +34,8 @@ void TracePC::HandleTrace(uint64_t *Guar
}
if (Counter < 255)
Value++;
+ else
+ Value |= kBit63;
} else {
Value |= kBit63;
TotalCoverage++;
@@ -60,6 +62,12 @@ void TracePC::PrintModuleInfo() {
Printf("\n");
}
+void TracePC::ResetGuards() {
+ for (size_t M = 0; M < NumModules; M++)
+ for (uint64_t *X = Modules[M].Start; X < Modules[M].Stop; X++)
+ *X = (*X >> 32) << 32;
+}
+
void TracePC::FinalizeTrace() {
if (UseCounters && TotalCoverage) {
for (size_t M = 0; M < NumModules; M++) {
Modified: llvm/trunk/lib/Fuzzer/test/trace-pc/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Fuzzer/test/trace-pc/CMakeLists.txt?rev=281814&r1=281813&r2=281814&view=diff
==============================================================================
--- llvm/trunk/lib/Fuzzer/test/trace-pc/CMakeLists.txt (original)
+++ llvm/trunk/lib/Fuzzer/test/trace-pc/CMakeLists.txt Sat Sep 17 01:01:55 2016
@@ -36,4 +36,4 @@ set_target_properties(LLVMFuzzer-DSO1 PR
set_target_properties(LLVMFuzzer-DSO2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY
"${CMAKE_BINARY_DIR}/lib/Fuzzer/lib")
-set(TestBinaries ${TestBinaries} LLVMFuzzer-DSOTest)
+set(TestBinaries ${TestBinaries} LLVMFuzzer-DSOTest PARENT_SCOPE)
More information about the llvm-commits
mailing list