[analyzer] Executed lines: store file IDs, not hashes.

George Karpenkov · George Karpenkov · commit a3fdd1790739 · 2018-09-07T00:43:37.000Z
Raw FileIDs are needed for the PlistDiagnostics to produce stable filenames. Differential Revision: https://reviews.llvm.org/D51668 llvm-svn: 341619
diff --git a/clang/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h b/clang/include/clang/StaticAnalyzer/Core/BugReporter/PathDiagnostic.h
@@ -759,7 +759,7 @@ class PathDiagnosticNotePiece: public PathDiagnosticSpotPiece {
 };
 
 /// File IDs mapped to sets of line numbers.
-using FilesToLineNumsMap = std::map<unsigned, std::set<unsigned>>;
+using FilesToLineNumsMap = std::map<FileID, std::set<unsigned>>;
 
 /// PathDiagnostic - PathDiagnostic objects represent a single path-sensitive
 ///  diagnostic.  It represents an ordered-collection of PathDiagnosticPieces,
diff --git a/clang/lib/StaticAnalyzer/Core/BugReporter.cpp b/clang/lib/StaticAnalyzer/Core/BugReporter.cpp
@@ -1893,7 +1893,7 @@ static void updateExecutedLinesWithDiagnosticPieces(
     FileID FID = Loc.getFileID();
     unsigned LineNo = Loc.getLineNumber();
     assert(FID.isValid());
-    ExecutedLines[FID.getHashValue()].insert(LineNo);
+    ExecutedLines[FID].insert(LineNo);
   }
 }
 
@@ -3030,7 +3030,7 @@ static void populateExecutedLinesWithFunctionSignature(
 
   FileID FID = SM.getFileID(SM.getExpansionLoc(Start));
   for (unsigned Line = StartLine; Line <= EndLine; Line++)
-    ExecutedLines->operator[](FID.getHashValue()).insert(Line);
+    ExecutedLines->operator[](FID).insert(Line);
 }
 
 static void populateExecutedLinesWithStmt(
@@ -3042,7 +3042,7 @@ static void populateExecutedLinesWithStmt(
   SourceLocation ExpansionLoc = SM.getExpansionLoc(Loc);
   FileID FID = SM.getFileID(ExpansionLoc);
   unsigned LineNo = SM.getExpansionLineNumber(ExpansionLoc);
-  ExecutedLines->operator[](FID.getHashValue()).insert(LineNo);
+  ExecutedLines->operator[](FID).insert(LineNo);
 }
 
 /// \return all executed lines including function signatures on the path
diff --git a/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp b/clang/lib/StaticAnalyzer/Core/HTMLDiagnostics.cpp
@@ -346,7 +346,7 @@ static void serializeExecutedLines(
     if (I != ExecutedLines.begin())
       os << ", ";
 
-    os << "\"" << I->first << "\": {";
+    os << "\"" << I->first.getHashValue() << "\": {";
     for (unsigned LineNo : I->second) {
       if (LineNo != *(I->second.begin()))
         os << ", ";

Original file line number	Diff line number	Diff line change
`@@ -1893,7 +1893,7 @@ static void updateExecutedLinesWithDiagnosticPieces(`
`1893`	`1893`	`FileID FID = Loc.getFileID();`
`1894`	`1894`	`unsigned LineNo = Loc.getLineNumber();`
`1895`	`1895`	`assert(FID.isValid());`
`1896`		`- ExecutedLines[FID.getHashValue()].insert(LineNo);`
	`1896`	`+ ExecutedLines[FID].insert(LineNo);`
`1897`	`1897`	`}`
`1898`	`1898`	`}`
`1899`	`1899`
`@@ -3030,7 +3030,7 @@ static void populateExecutedLinesWithFunctionSignature(`
`3030`	`3030`
`3031`	`3031`	`FileID FID = SM.getFileID(SM.getExpansionLoc(Start));`
`3032`	`3032`	`for (unsigned Line = StartLine; Line <= EndLine; Line++)`
`3033`		`- ExecutedLines->operator[](FID.getHashValue()).insert(Line);`
	`3033`	`+ ExecutedLines->operator[](FID).insert(Line);`
`3034`	`3034`	`}`
`3035`	`3035`
`3036`	`3036`	`static void populateExecutedLinesWithStmt(`
`@@ -3042,7 +3042,7 @@ static void populateExecutedLinesWithStmt(`
`3042`	`3042`	`SourceLocation ExpansionLoc = SM.getExpansionLoc(Loc);`
`3043`	`3043`	`FileID FID = SM.getFileID(ExpansionLoc);`
`3044`	`3044`	`unsigned LineNo = SM.getExpansionLineNumber(ExpansionLoc);`
`3045`		`- ExecutedLines->operator[](FID.getHashValue()).insert(LineNo);`
	`3045`	`+ ExecutedLines->operator[](FID).insert(LineNo);`
`3046`	`3046`	`}`
`3047`	`3047`
`3048`	`3048`	`/// \return all executed lines including function signatures on the path`