[sancov] correct object files handling.

[aizatsky]

Summary

Updating sancov invocation on html_cov_dump.

sancov change: http://reviews.llvm.org/D17169

[kcc]

LGTM

compiler-rt/trunk/lib/sanitizer_common/sanitizer_coverage_libcdep.cc

void CoverageData::GetRangeOffsets(const NamedPcRange& r, Symbolizer* sym,
   for (uptr i = 0; i < offsets->size(); i++)
     (*offsets)[i] = UnbundlePc((*offsets)[i]);
 }
 
 static void GenerateHtmlReport(const InternalMmapVector<char *> &sancov_argv) {
   if (!common_flags()->html_cov_report || sancov_argv[0] == nullptr) {
     return;
   }
-
   InternalScopedString report_path(kMaxPathLength);
   fd_t report_fd =
       CovOpenFile(&report_path, false /* packed */, GetProcessName(), "html");
   int pid = StartSubprocess(sancov_argv[0], sancov_argv.data(),
                             kInvalidFd /* stdin */, report_fd /* std_out */);
   if (pid > 0) {
     int result = WaitForProcess(pid);
-    if (result == 0) {
-      VReport(1, " CovDump: html report generated to %s (%d)\n",
-              report_path.data(), result);
-    }
+    if (result == 0)
+      Printf("coverage report generated to %s\n", report_path.data());
   }
 }
 
 void CoverageData::DumpOffsets() {
   auto sym = Symbolizer::GetOrInit();
   if (!common_flags()->coverage_pcs) return;
   CHECK_NE(sym, nullptr);
   InternalMmapVector<uptr> offsets(0);
   InternalScopedString path(kMaxPathLength);
 
-  InternalMmapVector<char *> sancov_argv(module_name_vec.size() + 2);
+  InternalMmapVector<char *> sancov_argv(module_name_vec.size() * 2 + 3);
   sancov_argv.push_back(FindPathToBinary(common_flags()->sancov_path));
-  if (GetArgv() != nullptr) {
-    sancov_argv.push_back(internal_strdup("-obj"));
-    sancov_argv.push_back(internal_strdup(GetArgv()[0]));
-  }
   sancov_argv.push_back(internal_strdup("-html-report"));
   auto argv_deleter = at_scope_exit([&] {
     for (uptr i = 0; i < sancov_argv.size(); ++i) {
       InternalFree(sancov_argv[i]);
     }
   });
 
   for (uptr m = 0; m < module_name_vec.size(); m++) {
if (cov_sandboxed) {
         VReport(1, " CovDump: %zd PCs written to packed file\n", num_offsets);
       }
     } else {
       // One file per module per process.
       fd_t fd = CovOpenFile(&path, false /* packed */, module_name);
       if (fd == kInvalidFd) continue;
       WriteToFile(fd, offsets.data(), offsets.size() * sizeof(offsets[0]));
       CloseFile(fd);
+      sancov_argv.push_back(internal_strdup(r.copied_module_name));
       sancov_argv.push_back(internal_strdup(path.data()));
       VReport(1, " CovDump: %s: %zd PCs written\n", path.data(), num_offsets);
     }
   }
   if (cov_fd != kInvalidFd)
     CloseFile(cov_fd);
 
   sancov_argv.push_back(nullptr);

compiler-rt/trunk/test/asan/TestCases/Linux/coverage_html_report.cc

 int main(int argc, char **argv) {
   fprintf(stderr, "PID: %d\n", getpid());
   bar();
   return 0;
 }
 
 // CHECK-main: PID: [[PID:[0-9]+]]
 // CHECK-main: [[PID]].sancov: 2 PCs written
-// CHECK-main: html report generated to ./coverage_html_report.cc.tmp.[[PID]].html
+// CHECK-main: coverage report generated to ./coverage_html_report.cc.tmp.[[PID]].html
 // CHECK-ls: coverage_html_report.cc.tmp.{{[0-9]+}}.html