When using -analyzer-output-plist always output a plist file even if it contains no error reports.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62871 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Driver/Analyses.def b/Driver/Analyses.def
index 1f702cc..3beaa73 100644
--- a/Driver/Analyses.def
+++ b/Driver/Analyses.def
@@ -56,11 +56,11 @@
ANALYSIS_STORE(RegionStore, "region", "Use region-based analyzer store")
#ifndef ANALYSIS_DIAGNOSTICS
-#define ANALYSIS_DIAGNOSTICS(NAME, CMDFLAG, DESC, CREATEFN)
+#define ANALYSIS_DIAGNOSTICS(NAME, CMDFLAG, DESC, CREATEFN, AUTOCREATE)
#endif
-ANALYSIS_DIAGNOSTICS(HTML, "html", "Output analysis results using HTML", CreateHTMLDiagnosticClient)
-ANALYSIS_DIAGNOSTICS(PLIST, "plist", "Output analysis results using Plists", CreatePlistDiagnosticClient)
+ANALYSIS_DIAGNOSTICS(HTML, "html", "Output analysis results using HTML", CreateHTMLDiagnosticClient, false)
+ANALYSIS_DIAGNOSTICS(PLIST, "plist", "Output analysis results using Plists", CreatePlistDiagnosticClient, true)
#undef ANALYSIS
#undef ANALYSIS_STORE
diff --git a/Driver/AnalysisConsumer.cpp b/Driver/AnalysisConsumer.cpp
index 1ada515..236cc1d 100644
--- a/Driver/AnalysisConsumer.cpp
+++ b/Driver/AnalysisConsumer.cpp
@@ -207,7 +207,7 @@
if (C.PD.get() == 0 && !C.HTMLDir.empty()) {
switch (C.DC) {
default:
-#define ANALYSIS_DIAGNOSTICS(NAME, CMDFLAG, DESC, CREATEFN)\
+#define ANALYSIS_DIAGNOSTICS(NAME, CMDFLAG, DESC, CREATEFN, AUTOCREATE)\
case PD_##NAME: C.PD.reset(CREATEFN(C.HTMLDir, C.PP, C.PPF)); break;
#include "Analyses.def"
}
@@ -288,6 +288,15 @@
CreateConstraintMgr = ManagerRegistry::ConstraintMgrCreator;
else
CreateConstraintMgr = CreateBasicConstraintManager;
+
+ // Some DiagnosticClients should be created all the time instead of
+ // lazily. Create those now.
+ switch (C.DC) {
+ default: break;
+#define ANALYSIS_DIAGNOSTICS(NAME, CMDFLAG, DESC, CREATEFN, AUTOCREATE)\
+case PD_##NAME: if (AUTOCREATE) getPathDiagnosticClient(); break;
+#include "Analyses.def"
+ }
}
};
diff --git a/Driver/AnalysisConsumer.h b/Driver/AnalysisConsumer.h
index 27c8e6e..1e08240 100644
--- a/Driver/AnalysisConsumer.h
+++ b/Driver/AnalysisConsumer.h
@@ -29,7 +29,7 @@
};
enum AnalysisDiagClients {
-#define ANALYSIS_DIAGNOSTICS(NAME, CMDFLAG, DESC, CREATFN) PD_##NAME,
+#define ANALYSIS_DIAGNOSTICS(NAME, CMDFLAG, DESC, CREATFN, AUTOCREAT) PD_##NAME,
#include "Analyses.def"
NUM_ANALYSIS_DIAG_CLIENTS
};
diff --git a/Driver/clang.cpp b/Driver/clang.cpp
index cf58f34..cc3788b 100644
--- a/Driver/clang.cpp
+++ b/Driver/clang.cpp
@@ -239,7 +239,7 @@
AnalysisDiagOpt(llvm::cl::desc("SCA Output Options:"),
llvm::cl::init(PD_HTML),
llvm::cl::values(
-#define ANALYSIS_DIAGNOSTICS(NAME, CMDFLAG, DESC, CREATFN)\
+#define ANALYSIS_DIAGNOSTICS(NAME, CMDFLAG, DESC, CREATFN, AUTOCREATE)\
clEnumValN(PD_##NAME, "analyzer-output-" CMDFLAG, DESC),
#include "Analyses.def"
clEnumValEnd));
diff --git a/lib/Driver/PlistDiagnostics.cpp b/lib/Driver/PlistDiagnostics.cpp
index ab5b5a3..72d64ed 100644
--- a/lib/Driver/PlistDiagnostics.cpp
+++ b/lib/Driver/PlistDiagnostics.cpp
@@ -50,17 +50,17 @@
}
static void AddFID(FIDMap &FIDs, llvm::SmallVectorImpl<FileID> &V,
- SourceManager& SM, SourceLocation L) {
+ SourceManager* SM, SourceLocation L) {
- FileID FID = SM.getFileID(SM.getInstantiationLoc(L));
+ FileID FID = SM->getFileID(SM->getInstantiationLoc(L));
FIDMap::iterator I = FIDs.find(FID);
if (I != FIDs.end()) return;
FIDs[FID] = V.size();
V.push_back(FID);
}
-static unsigned GetFID(const FIDMap& FIDs, SourceManager& SM, SourceLocation L){
- FileID FID = SM.getFileID(SM.getInstantiationLoc(L));
+static unsigned GetFID(const FIDMap& FIDs, SourceManager* SM, SourceLocation L){
+ FileID FID = SM->getFileID(SM->getInstantiationLoc(L));
FIDMap::const_iterator I = FIDs.find(FID);
assert(I != FIDs.end());
return I->second;
@@ -72,21 +72,21 @@
return o;
}
-static void EmitLocation(llvm::raw_ostream& o, SourceManager& SM,
+static void EmitLocation(llvm::raw_ostream& o, SourceManager* SM,
SourceLocation L, const FIDMap& FM,
const unsigned indent) {
Indent(o, indent) << "<dict>\n";
Indent(o, indent) << " <key>line</key><integer>"
- << SM.getInstantiationLineNumber(L) << "</integer>\n";
+ << SM->getInstantiationLineNumber(L) << "</integer>\n";
Indent(o, indent) << " <key>col</key><integer>"
- << SM.getInstantiationColumnNumber(L) << "</integer>\n";
+ << SM->getInstantiationColumnNumber(L) << "</integer>\n";
Indent(o, indent) << " <key>file</key><integer>"
<< GetFID(FM, SM, L) << "</integer>\n";
Indent(o, indent) << "</dict>\n";
}
-static void EmitRange(llvm::raw_ostream& o, SourceManager& SM, SourceRange R,
+static void EmitRange(llvm::raw_ostream& o, SourceManager* SM, SourceRange R,
const FIDMap& FM, const unsigned indent) {
Indent(o, indent) << "<array>\n";
@@ -96,7 +96,7 @@
}
static void ReportDiag(llvm::raw_ostream& o, const PathDiagnosticPiece& P,
- const FIDMap& FM, SourceManager& SM) {
+ const FIDMap& FM, SourceManager* SM) {
unsigned indent = 2;
Indent(o, indent) << "<dict>\n";
@@ -154,7 +154,10 @@
// ranges of the diagnostics.
FIDMap FM;
llvm::SmallVector<FileID, 10> Fids;
- SourceManager& SM = (*BatchedDiags.begin())->begin()->getLocation().getManager();
+ SourceManager* SM = 0;
+
+ if (!BatchedDiags.empty())
+ SM = &(*BatchedDiags.begin())->begin()->getLocation().getManager();
for (std::vector<const PathDiagnostic*>::iterator DI = BatchedDiags.begin(),
DE = BatchedDiags.end(); DI != DE; ++DI) {
@@ -195,7 +198,7 @@
for (llvm::SmallVectorImpl<FileID>::iterator I=Fids.begin(), E=Fids.end();
I!=E; ++I)
- o << " <string>" << SM.getFileEntryForID(*I)->getName() << "</string>\n";
+ o << " <string>" << SM->getFileEntryForID(*I)->getName() << "</string>\n";
o << " </array>\n"
" <key>diagnostics</key>\n"