maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[libFuzzer] remove deprecated support for -fsanitize-coverage=trace-pc[-guard] 

llvm-svn: 352566
This commit is contained in:
Kostya Serebryany 2019-01-29 23:40:05 +00:00
parent 3de9a96174
commit 62d7270610
1 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
compiler-rt/lib/fuzzer/FuzzerTracePC.cpp
View File

@ -23,15 +23,6 @@
#include "FuzzerValueBitMap.h" #include "FuzzerValueBitMap.h"
#include <set> #include <set>
// The coverage counters and PCs.
// These are declared as global variables named "__sancov_*" to simplify
// experiments with inlined instrumentation.
alignas(64) ATTRIBUTE_INTERFACE
uint8_t __sancov_trace_pc_guard_8bit_counters[fuzzer::TracePC::kNumPCs];
ATTRIBUTE_INTERFACE
uintptr_t __sancov_trace_pc_pcs[fuzzer::TracePC::kNumPCs];
// Used by -fsanitize-coverage=stack-depth to track stack depth // Used by -fsanitize-coverage=stack-depth to track stack depth
ATTRIBUTES_INTERFACE_TLS_INITIAL_EXEC uintptr_t __sancov_lowest_stack; ATTRIBUTES_INTERFACE_TLS_INITIAL_EXEC uintptr_t __sancov_lowest_stack;
@ -39,13 +30,9 @@ namespace fuzzer {
TracePC TPC; TracePC TPC;
uint8_t *TracePC::Counters() const { /// ZZZ uint8_t *TracePC::Counters() const {
return __sancov_trace_pc_guard_8bit_counters;
}
uintptr_t *TracePC::PCs() const { /// ZZZ uintptr_t *TracePC::PCs() const {
return __sancov_trace_pc_pcs;
}
size_t TracePC::GetTotalPCCoverage() { size_t TracePC::GetTotalPCCoverage() {
if (ObservedPCs.size()) if (ObservedPCs.size())
@ -96,13 +83,6 @@ void TracePC::HandleInit(uint32_t *Start, uint32_t *Stop) {
} }
void TracePC::PrintModuleInfo() { void TracePC::PrintModuleInfo() {
if (NumGuards) {
Printf("INFO: Loaded %zd modules (%zd guards): ", NumModules, NumGuards);
for (size_t i = 0; i < NumModules; i++)
Printf("%zd [%p, %p), ", Modules[i].Stop - Modules[i].Start,
Modules[i].Start, Modules[i].Stop);
Printf("\n");
}
if (NumModulesWithInline8bitCounters) { if (NumModulesWithInline8bitCounters) {
Printf("INFO: Loaded %zd modules (%zd inline 8-bit counters): ", Printf("INFO: Loaded %zd modules (%zd inline 8-bit counters): ",
NumModulesWithInline8bitCounters, NumInline8bitCounters); NumModulesWithInline8bitCounters, NumInline8bitCounters);
@ -120,8 +100,7 @@ void TracePC::PrintModuleInfo() {
} }
Printf("\n"); Printf("\n");
if ((NumGuards && NumGuards != NumPCsInPCTables) || if (NumInline8bitCounters && NumInline8bitCounters != NumPCsInPCTables) {
(NumInline8bitCounters && NumInline8bitCounters != NumPCsInPCTables)) {
Printf("ERROR: The size of coverage PC tables does not match the\n" Printf("ERROR: The size of coverage PC tables does not match the\n"
"number of instrumented PCs. This might be a compiler bug,\n" "number of instrumented PCs. This might be a compiler bug,\n"
"please contact the libFuzzer developers.\n" "please contact the libFuzzer developers.\n"
@ -200,17 +179,6 @@ void TracePC::UpdateObservedPCs() {
if (Beg[j]) if (Beg[j])
Observe(ModulePCTable[i].Start[j]); Observe(ModulePCTable[i].Start[j]);
} }
} else if (NumGuards == NumPCsInPCTables) {
size_t GuardIdx = 1;
for (size_t i = 0; i < NumModules; i++) {
uint32_t *Beg = Modules[i].Start;
size_t Size = Modules[i].Stop - Beg;
assert(Size ==
(size_t)(ModulePCTable[i].Stop - ModulePCTable[i].Start));
for (size_t j = 0; j < Size; j++, GuardIdx++)
if (Counters()[GuardIdx])
Observe(ModulePCTable[i].Start[j]);
}
} }
} }