commit 0e8715115fa9a82fc61e3a314fdc95d0ee4acfee
author kcc <kcc> Tue Jan 29 23:41:50 2019 +0000
committer kcc <kcc> Tue Jan 29 23:41:50 2019 +0000
tree 3e8e90990d5ad36ccf9d65dfc39883a73d54345f
parent 5dea9b638076555252739a303cbe83b4802d44c7

[libFuzzer] revert an accidental commit

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

FuzzerTracePC.cpp

diff --git a/FuzzerTracePC.cpp b/FuzzerTracePC.cpp
index 17b62e1..695eee2 100644
--- a/FuzzerTracePC.cpp
+++ b/FuzzerTracePC.cpp
@@ -23,6 +23,15 @@
 #include "FuzzerValueBitMap.h"
 #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
 ATTRIBUTES_INTERFACE_TLS_INITIAL_EXEC uintptr_t __sancov_lowest_stack;
 
@@ -30,9 +39,13 @@
 
 TracePC TPC;
 
-/// ZZZ uint8_t *TracePC::Counters() const {
+uint8_t *TracePC::Counters() const {
+  return __sancov_trace_pc_guard_8bit_counters;
+}
 
-/// ZZZ uintptr_t *TracePC::PCs() const {
+uintptr_t *TracePC::PCs() const {
+  return __sancov_trace_pc_pcs;
+}
 
 size_t TracePC::GetTotalPCCoverage() {
   if (ObservedPCs.size())
@@ -83,6 +96,13 @@
 }
 
 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) {
     Printf("INFO: Loaded %zd modules   (%zd inline 8-bit counters): ",
            NumModulesWithInline8bitCounters, NumInline8bitCounters);
@@ -100,7 +120,8 @@
     }
     Printf("\n");
 
-    if (NumInline8bitCounters && NumInline8bitCounters != NumPCsInPCTables) {
+    if ((NumGuards && NumGuards != NumPCsInPCTables) ||
+        (NumInline8bitCounters && NumInline8bitCounters != NumPCsInPCTables)) {
       Printf("ERROR: The size of coverage PC tables does not match the\n"
              "number of instrumented PCs. This might be a compiler bug,\n"
              "please contact the libFuzzer developers.\n"
@@ -179,6 +200,17 @@
           if (Beg[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]);
+      }
     }
   }