[analyzer] Fix filename in cross-file HTML report

[malcolm.parsons]

Summary

The filename is currently taken from the start of the path, while the
line and column are taken from the end of the path.
This didn't matter until cross-file path reporting was added.

[vlad.tsyrklevich]

This LGTM, but 1) you should add a test, probably just need to another CHECK to test/Coverage/html-multifile-diagnostics.c from D30406, and 2) someone from the analyzer team should sign off on it too.

[malcolm.parsons]

Add test

[george.karpenkov]

LGTM

[NoQ]

Thanks! I noticed the problem but never investigated it.

lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp

if (SupportsCrossFileDiagnostics && FileIDs.size() > 1) {
     }
   }
 
   const RewriteBuffer *Buf = R.getRewriteBufferFor(FileIDs[0]);
   if (!Buf)
     return {};
 
   // Add CSS, header, and footer.
-  const FileEntry* Entry = SMgr.getFileEntryForID(FileIDs[0]);
+  FileID FID =
+      path.back()->getLocation().asLocation().getExpansionLoc().getFileID();
+  const FileEntry* Entry = SMgr.getFileEntryForID(FID);
   FinalizeHTML(D, R, SMgr, path, FileIDs[0], Entry, declName);
 
   std::string file;
   llvm::raw_string_ostream os(file);
   for (auto BI : *Buf)
     os << BI;
 
   return os.str();

test/Coverage/html-multifile-diagnostics.c

 // RUN: rm -rf %t
 // RUN: %clang_cc1 -analyze -analyzer-output=html -analyzer-checker=core -o %t %s
 // RUN: find %t -name "*.html" -exec cat "{}" ";" | FileCheck %s
 
 // REQUIRES: staticanalyzer
 
+// CHECK: <!-- FILENAME html-multifile-diagnostics.h -->
+
 // CHECK: <h3>Annotated Source Code</h3>
 
 // Make sure it's generated as multi-file HTML output
 // CHECK: <h4 class=FileName>{{.*}}html-multifile-diagnostics.c</h4>
 // CHECK: <h4 class=FileName>{{.*}}html-multifile-diagnostics.h</h4>
 
 // Without tweaking expr, the expr would hit to the line below
 // emitted to the output as comment.
 // CHECK: {{[D]ereference of null pointer}}
 
 #include "html-multifile-diagnostics.h"
 
 void f0() {
   f1((int*)0);
 }