[analyzer] Add more FileIDs to PlistDiagnostic map to avoid assertion

Some FileIDs that may be used by PlistDiagnostics were not added while building
a list of pieces. This caused assertion violation in GetFID() function.
This patch adds some missing FileIDs to avoid the assertion. It also contains
small refactoring of PlistDiagnostics::FlushDiagnosticsImpl().

Patch by Aleksei Sidorin, Ilya Palachev.

Differential Revision: https://reviews.llvm.org/D22090

llvm-svn: 280360

2 files changed, 10 insertions, 0 deletions

diff --git a/clang/test/Analysis/diagnostics/Inputs/include/plist-diagnostics-include-check-macro.def b/clang/test/Analysis/diagnostics/Inputs/include/plist-diagnostics-include-check-macro.def
new file mode 100644
index 00000000000..9bbd9366906
--- /dev/null
+++ b/clang/test/Analysis/diagnostics/Inputs/include/plist-diagnostics-include-check-macro.def
@@ -0,0 +1 @@
+PLIST_DEF_MACRO
diff --git a/clang/test/Analysis/diagnostics/Inputs/include/plist-diagnostics-include-check-macro.h b/clang/test/Analysis/diagnostics/Inputs/include/plist-diagnostics-include-check-macro.h
new file mode 100644
index 00000000000..9ce68ed08d1
--- /dev/null
+++ b/clang/test/Analysis/diagnostics/Inputs/include/plist-diagnostics-include-check-macro.h
@@ -0,0 +1,9 @@
+void clang_analyzer_warnIfReached();
+
+class PlistCheckMacro {
+public:
+  PlistCheckMacro () { }
+  void run() {
+    clang_analyzer_warnIfReached();
+  }
+};