maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

When using -analyzer-output-plist always output a plist file even if it contains no error reports. 

llvm-svn: 62871
This commit is contained in:
Ted Kremenek 2009-01-23 20:06:20 +00:00
parent 505f751451
commit 099243aa9e
5 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/Driver/Analyses.def
View File

@ -56,11 +56,11 @@ ANALYSIS_STORE(BasicStore, "basic", "Use basic analyzer store")
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

11
clang/Driver/AnalysisConsumer.cpp
View File

@ -207,7 +207,7 @@ namespace {
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 @@ case PD_##NAME: C.PD.reset(CREATEFN(C.HTMLDir, C.PP, C.PPF)); break;
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"
}
}
};

2
clang/Driver/AnalysisConsumer.h
View File

@ -29,7 +29,7 @@ NumStores
};
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
};

2
clang/Driver/clang.cpp
View File

@ -239,7 +239,7 @@ static llvm::cl::opt<AnalysisDiagClients>
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));

25
clang/lib/Driver/PlistDiagnostics.cpp
View File

@ -50,17 +50,17 @@ clang::CreatePlistDiagnosticClient(const std::string& s,
}
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 @@ static llvm::raw_ostream& Indent(llvm::raw_ostream& o, const unsigned indent) {
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 EmitRange(llvm::raw_ostream& o, SourceManager& SM, SourceRange R,
}
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 @@ PlistDiagnostics::~PlistDiagnostics() {
// 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 @@ PlistDiagnostics::~PlistDiagnostics() {
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"