sancov: coverage can be reported by multiple functions.

[krasin]

LGTM with a nit.

tools/sancov/sancov.cc

233

llvm_unreachable();

[aizatsky]

tools/sancov/sancov.cc

233

It's actually reachable now, I'll update the comment.

tools/sancov/sancov.cc

if (!ProcessedFunctions.insert(FunctionName).second)
       continue;
 
     result.insert(FunctionLoc{P.first, P.second});
   }
 
   return result;
 }
 
-// Locate __sanitizer_cov function address.
-static uint64_t findSanitizerCovFunction(const object::ObjectFile &O) {
+// Locate __sanitizer_cov* function addresses that are used for coverage
+// reporting.
+static std::set<uint64_t>
+findSanitizerCovFunctions(const object::ObjectFile &O) {
+  std::set<uint64_t> Result;
+
   for (const object::SymbolRef &Symbol : O.symbols()) {
     ErrorOr<uint64_t> AddressOrErr = Symbol.getAddress();
     FailIfError(AddressOrErr);
 
-    ErrorOr<StringRef> Name = Symbol.getName();
-    FailIfError(Name);
+    ErrorOr<StringRef> NameOrErr = Symbol.getName();
+    FailIfError(NameOrErr);
+    StringRef Name = NameOrErr.get();
 
-    if (Name.get() == "__sanitizer_cov") {
-      return AddressOrErr.get();
+    if (Name == "__sanitizer_cov" || Name == "__sanitizer_cov_with_check" ||
+        Name == "__sanitizer_cov_trace_func_enter") {
+      Result.insert(AddressOrErr.get());
     }
   }
+
+  if (Result.empty())
     FailIfNotEmpty("__sanitizer_cov not found");
-  return 0; // not reachable.
+
+  return Result; // not reachable.
 }
 
 // Locate addresses of all coverage points in a file. Coverage point
 // is defined as the 'address of instruction following __sanitizer_cov
 // call - 1'.
 static void getObjectCoveragePoints(const object::ObjectFile &O,
                                     std::set<uint64_t> *Addrs) {
   Triple TheTriple("unknown-unknown-unknown");
static void getObjectCoveragePoints(const object::ObjectFile &O,
 
   std::unique_ptr<const MCInstrInfo> MII(TheTarget->createMCInstrInfo());
   FailIfEmpty(MII, "no instruction info for target " + TripleName);
 
   std::unique_ptr<const MCInstrAnalysis> MIA(
       TheTarget->createMCInstrAnalysis(MII.get()));
   FailIfEmpty(MIA, "no instruction analysis info for target " + TripleName);
 
-  uint64_t SanCovAddr = findSanitizerCovFunction(O);
+  auto SanCovAddrs = findSanitizerCovFunctions(O);
 
   for (const auto Section : O.sections()) {
     if (Section.isVirtual() || !Section.isText()) // llvm-objdump does the same.
       continue;
     uint64_t SectionAddr = Section.getAddress();
     uint64_t SectSize = Section.getSize();
     if (!SectSize)
       continue;
for (uint64_t Index = 0, Size = 0; Index < Section.getSize();
                                   SectionAddr + Index, nulls(), nulls())) {
         if (Size == 0)
           Size = 1;
         continue;
       }
       uint64_t Target;
       if (MIA->isCall(Inst) &&
           MIA->evaluateBranch(Inst, SectionAddr + Index, Size, Target)) {
-        if (Target == SanCovAddr) {
+        if (SanCovAddrs.find(Target) != SanCovAddrs.end()) {
           // Sanitizer coverage uses the address of the next instruction - 1.
           Addrs->insert(Index + SectionAddr + Size - 1);
         }
       }
     }
   }
 }