[sancov] print_coverage_points command.

[aizatsky]

nits

[kcc]

Wh not print-coverage-pcs?

[aizatsky]

renamed option.

[aizatsky]

In D17670#363435, @kcc wrote:

Wh not print-coverage-pcs?

done

[kcc]

LGTM

llvm/trunk/test/tools/sancov/print_coverage_pcs.test

+REQUIRES: x86_64-linux
+RUN: sancov -print-coverage-pcs %p/Inputs/test-linux_x86_64 | FileCheck %s
+
+CHECK: 0x4cced1
+CHECK: 0x4ccf01
+CHECK: 0x4dbe2b
+CHECK: 0x4dbf72
+CHECK: 0x4dbfc2
+CHECK: 0x4dbfec
+CHECK: 0x4dc033
+CHECK: 0x4dc06a
+CHECK: 0x4dc09d
+CHECK: 0x4dc0d0
+CHECK: 0x4dc17f
+CHECK: 0x4dc1c6
+CHECK: 0x4dc20d
+CHECK: 0x4dc237
+CHECK: 0x4dc265
+CHECK: 0x4dc34c
+

llvm/trunk/tools/sancov/sancov.cc

 using namespace llvm;
 
 namespace {
 
 // --------- COMMAND LINE FLAGS ---------
 
 enum ActionType {
   PrintAction,
+  PrintCovPointsAction,
   CoveredFunctionsAction,
   NotCoveredFunctionsAction,
   HtmlReportAction
 };
 
 cl::opt<ActionType> Action(
     cl::desc("Action (required)"), cl::Required,
     cl::values(clEnumValN(PrintAction, "print", "Print coverage addresses"),
+               clEnumValN(PrintCovPointsAction, "print-coverage-pcs",
+                          "Print coverage instrumentation points addresses."),
                clEnumValN(CoveredFunctionsAction, "covered-functions",
                           "Print all covered funcions."),
                clEnumValN(NotCoveredFunctionsAction, "not-covered-functions",
                           "Print all not covered funcions."),
                clEnumValN(HtmlReportAction, "html-report",
                           "Print HTML coverage report."),
                clEnumValEnd));
 

 std::set<uint64_t> getCoveragePoints(std::string FileName) {
   std::set<uint64_t> Result;
   visitObjectFiles(FileName, [&](const object::ObjectFile &O) {
     getObjectCoveragePoints(O, &Result);
   });
   return Result;
 }
 
+static void printCovPoints(std::string ObjFile, raw_ostream &OS) {
+  for (uint64_t Addr : getCoveragePoints(ObjFile)) {
+    OS << "0x";
+    OS.write_hex(Addr);
+    OS << "\n";
+  }
+}
+
 static std::string escapeHtml(const std::string &S) {
   std::string Result;
   Result.reserve(S.size());
   for (char Ch : S) {
     switch (Ch) {
     case '&':
       Result.append("&amp;");
       break;
int main(int argc, char **argv) {
   cl::ParseCommandLineOptions(argc, argv, "Sanitizer Coverage Processing Tool");
 
   // -print doesn't need object files.
   if (Action == PrintAction) {
     auto CovData = CoverageData::readAndMerge(ClInputFiles);
     FailIfError(CovData);
     CovData.get()->printAddrs(outs());
     return 0;
+  } else if (Action == PrintCovPointsAction) {
+    // -print-coverage-points doesn't need coverage files.
+    for (std::string ObjFile : ClInputFiles) {
+      printCovPoints(ObjFile, outs());
+    }
+    return 0;
   }
 
   auto CovDataSet = CoverageDataSet::readCmdArguments(ClInputFiles);
   FailIfError(CovDataSet);
 
   if (CovDataSet.get()->empty()) {
     Fail("No coverage files specified.");
   }
 
   switch (Action) {
   case CoveredFunctionsAction: {
     CovDataSet.get()->printCoveredFunctions(outs());
     return 0;
   }
   case NotCoveredFunctionsAction: {
     CovDataSet.get()->printNotCoveredFunctions(outs());
     return 0;
   }
   case HtmlReportAction: {
     CovDataSet.get()->printReport(outs());
     return 0;
   }
   case PrintAction:
+  case PrintCovPointsAction:
     llvm_unreachable("unsupported action");
   }
 }