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

Hooked up GRSimpleAPICheck and the simple Objective-C Foundation checks to use 

the new BugReporter interface.

llvm-svn: 49180
This commit is contained in:
Ted Kremenek 2008-04-03 17:57:38 +00:00
parent c2546d6518
commit cb2dc8eca5
6 changed files with 136 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/include/clang/Analysis/PathSensitive/BugReporter.h
View File

@ -41,6 +41,9 @@ public:
virtual PathDiagnosticPiece* getEndPath(ASTContext& Ctx,
ExplodedNode<ValueState> *N) const;
virtual void getRanges(const SourceRange*& beg,
const SourceRange*& end) const;
};
class BugReporter {

10
clang/include/clang/Analysis/PathSensitive/GRSimpleAPICheck.h
View File

@ -22,12 +22,20 @@ namespace clang {
class ValueState;
class Diagnostic;
class BugReporter;
class ASTContext;
class GRExprEngine;
class PathDiagnosticClient;
template <typename T> class ExplodedGraph;
class GRSimpleAPICheck : public GRAuditor<ValueState> {
public:
GRSimpleAPICheck() {}
virtual ~GRSimpleAPICheck() {}
virtual void ReportResults(Diagnostic& D) {}
virtual void ReportResults(Diagnostic& Diag, PathDiagnosticClient* PD,
ASTContext& Ctx, BugReporter& BR,
ExplodedGraph<GRExprEngine>& G) = 0;
};
} // end namespace clang

186
clang/lib/Analysis/BasicObjCFoundationChecks.cpp
View File

@ -16,9 +16,10 @@
#include "BasicObjCFoundationChecks.h"
#include "clang/Analysis/PathSensitive/ExplodedGraph.h"
#include "clang/Analysis/PathSensitive/GRExprEngine.h"
#include "clang/Analysis/PathSensitive/GRSimpleAPICheck.h"
#include "clang/Analysis/PathSensitive/ValueState.h"
#include "clang/Analysis/PathSensitive/AnnotatedPath.h"
#include "clang/Analysis/PathSensitive/BugReporter.h"
#include "clang/Analysis/PathDiagnostic.h"
#include "clang/AST/Expr.h"
#include "clang/AST/ASTContext.h"
@ -29,48 +30,6 @@
using namespace clang;
namespace {
class VISIBILITY_HIDDEN BasicObjCFoundationChecks : public GRSimpleAPICheck {
ASTContext &Ctx;
ValueStateManager* VMgr;
typedef std::list<AnnotatedPath<ValueState> > ErrorsTy;
ErrorsTy Errors;
RVal GetRVal(ValueState* St, Expr* E) { return VMgr->GetRVal(St, E); }
bool isNSString(ObjCInterfaceType* T, const char* suffix);
bool AuditNSString(NodeTy* N, ObjCMessageExpr* ME);
void Warn(NodeTy* N, Expr* E, const std::string& s);
void WarnNilArg(NodeTy* N, Expr* E);
bool CheckNilArg(NodeTy* N, unsigned Arg);
public:
BasicObjCFoundationChecks(ASTContext& ctx, ValueStateManager* vmgr)
: Ctx(ctx), VMgr(vmgr) {}
virtual ~BasicObjCFoundationChecks() {}
virtual bool Audit(ExplodedNode<ValueState>* N);
virtual void ReportResults(Diagnostic& D);
};
} // end anonymous namespace
GRSimpleAPICheck*
clang::CreateBasicObjCFoundationChecks(ASTContext& Ctx,
ValueStateManager* VMgr) {
return new BasicObjCFoundationChecks(Ctx, VMgr);
}
static ObjCInterfaceType* GetReceiverType(ObjCMessageExpr* ME) {
Expr* Receiver = ME->getReceiver();
@ -90,6 +49,103 @@ static const char* GetReceiverNameType(ObjCMessageExpr* ME) {
: NULL;
}
namespace {
class VISIBILITY_HIDDEN NilArg : public BugDescription {
std::string Msg;
const char* s;
SourceRange R;
public:
NilArg(ObjCMessageExpr* ME, unsigned Arg);
virtual ~NilArg() {}
virtual const char* getName() const {
return "nil argument";
}
virtual const char* getDescription() const {
return s;
}
virtual void getRanges(const SourceRange*& beg,
const SourceRange*& end) const {
beg = &R;
end = beg+1;
}
};
NilArg::NilArg(ObjCMessageExpr* ME, unsigned Arg) : s(NULL) {
Expr* E = ME->getArg(Arg);
R = E->getSourceRange();
std::ostringstream os;
os << "Argument to '" << GetReceiverNameType(ME) << "' method '"
<< ME->getSelector().getName() << "' cannot be nil.";
Msg = os.str();
s = Msg.c_str();
}
class VISIBILITY_HIDDEN BasicObjCFoundationChecks : public GRSimpleAPICheck {
ASTContext &Ctx;
ValueStateManager* VMgr;
typedef std::vector<std::pair<NodeTy*,BugDescription*> > ErrorsTy;
ErrorsTy Errors;
RVal GetRVal(ValueState* St, Expr* E) { return VMgr->GetRVal(St, E); }
bool isNSString(ObjCInterfaceType* T, const char* suffix);
bool AuditNSString(NodeTy* N, ObjCMessageExpr* ME);
void Warn(NodeTy* N, Expr* E, const std::string& s);
void WarnNilArg(NodeTy* N, Expr* E);
bool CheckNilArg(NodeTy* N, unsigned Arg);
public:
BasicObjCFoundationChecks(ASTContext& ctx, ValueStateManager* vmgr)
: Ctx(ctx), VMgr(vmgr) {}
virtual ~BasicObjCFoundationChecks() {
for (ErrorsTy::iterator I = Errors.begin(), E = Errors.end(); I!=E; ++I)
delete I->second;
}
virtual bool Audit(ExplodedNode<ValueState>* N);
virtual void ReportResults(Diagnostic& Diag, PathDiagnosticClient* PD,
ASTContext& Ctx, BugReporter& BR,
ExplodedGraph<GRExprEngine>& G);
private:
void AddError(NodeTy* N, BugDescription* D) {
Errors.push_back(std::make_pair(N, D));
}
void WarnNilArg(NodeTy* N, ObjCMessageExpr* ME, unsigned Arg) {
AddError(N, new NilArg(ME, Arg));
}
};
} // end anonymous namespace
GRSimpleAPICheck*
clang::CreateBasicObjCFoundationChecks(ASTContext& Ctx,
ValueStateManager* VMgr) {
return new BasicObjCFoundationChecks(Ctx, VMgr);
}
bool BasicObjCFoundationChecks::Audit(ExplodedNode<ValueState>* N) {
ObjCMessageExpr* ME =
@ -127,43 +183,13 @@ static inline bool isNil(RVal X) {
//===----------------------------------------------------------------------===//
void BasicObjCFoundationChecks::Warn(NodeTy* N, Expr* E, const std::string& s) {
Errors.push_back(AnnotatedPath<ValueState>());
Errors.back().push_back(N, s, E);
}
void BasicObjCFoundationChecks::ReportResults(Diagnostic& Diag,
PathDiagnosticClient* PD,
ASTContext& Ctx, BugReporter& BR,
ExplodedGraph<GRExprEngine>& G) {
void BasicObjCFoundationChecks::ReportResults(Diagnostic& D) {
// FIXME: Expand errors into paths. For now, just issue warnings.
for (ErrorsTy::iterator I=Errors.begin(), E=Errors.end(); I!=E; ++I) {
AnnotatedNode<ValueState>& AN = I->back();
unsigned diag = D.getCustomDiagID(Diagnostic::Warning,
AN.getString().c_str());
Stmt* S = cast<PostStmt>(AN.getNode()->getLocation()).getStmt();
FullSourceLoc L(S->getLocStart(), Ctx.getSourceManager());
SourceRange R = AN.getExpr()->getSourceRange();
D.Report(L, diag, &AN.getString(), 1, &R, 1);
}
}
void BasicObjCFoundationChecks::WarnNilArg(NodeTy* N, Expr* E) {
ObjCMessageExpr* ME =
cast<ObjCMessageExpr>(cast<PostStmt>(N->getLocation()).getStmt());
std::ostringstream os;
os << "Argument to '" << GetReceiverNameType(ME) << "' method '"
<< ME->getSelector().getName()
<< "' cannot be nil.";
Warn(N, E, os.str());
for (ErrorsTy::iterator I=Errors.begin(), E=Errors.end(); I!=E; ++I)
BR.EmitPathWarning(Diag, PD, Ctx, *I->second, G, I->first);
}
bool BasicObjCFoundationChecks::CheckNilArg(NodeTy* N, unsigned Arg) {
@ -173,7 +199,7 @@ bool BasicObjCFoundationChecks::CheckNilArg(NodeTy* N, unsigned Arg) {
Expr * E = ME->getArg(Arg);
if (isNil(GetRVal(N->getState(), E))) {
WarnNilArg(N, E);
WarnNilArg(N, ME, Arg);
return true;
}

11
clang/lib/Analysis/BugReporter.cpp
View File

@ -43,8 +43,7 @@ static inline Stmt* GetStmt(const ProgramPoint& P) {
PathDiagnosticPiece*
BugDescription::getEndPath(ASTContext& Ctx,
ExplodedNode<ValueState> *N) const {
BugDescription::getEndPath(ASTContext& Ctx, ExplodedNode<ValueState> *N) const {
Stmt* S = GetStmt(N->getLocation());
@ -60,6 +59,12 @@ BugDescription::getEndPath(ASTContext& Ctx,
return P;
}
void BugDescription::getRanges(const SourceRange*& beg,
const SourceRange*& end) const {
beg = NULL;
end = NULL;
}
void BugReporter::GeneratePathDiagnostic(PathDiagnostic& PD, ASTContext& Ctx,
const BugDescription& B,
ExplodedGraph<GRExprEngine>& G,
@ -266,7 +271,7 @@ void BugReporter::EmitWarning(Diagnostic& Diag, ASTContext& Ctx,
return;
std::ostringstream os;
os << "[CHECKER] " << B.getName();
os << "[CHECKER] " << B.getDescription();
unsigned ErrorDiag = Diag.getCustomDiagID(Diagnostic::Warning,
os.str().c_str());

7
clang/lib/Analysis/GRSimpleVals.cpp
View File

@ -164,8 +164,8 @@ static void EmitWarning(Diagnostic& Diag, PathDiagnosticClient* PD,
namespace clang {
unsigned RunGRSimpleVals(CFG& cfg, Decl& CD, ASTContext& Ctx,
Diagnostic& Diag, PathDiagnosticClient* PD,
bool Visualize, bool TrimGraph) {
Diagnostic& Diag, PathDiagnosticClient* PD,
bool Visualize, bool TrimGraph) {
GRCoreEngine<GRExprEngine> Eng(cfg, CD, Ctx);
GRExprEngine* CS = &Eng.getCheckerState();
@ -217,7 +217,8 @@ unsigned RunGRSimpleVals(CFG& cfg, Decl& CD, ASTContext& Ctx,
EmitWarning(Diag, PD, Ctx, BR, RetStack(), G,
CS->ret_stackaddr_begin(), CS->ret_stackaddr_end());
FoundationCheck.get()->ReportResults(Diag);
FoundationCheck.get()->ReportResults(Diag, PD, Ctx, BR, G);
#ifndef NDEBUG
if (Visualize) CS->ViewGraph(TrimGraph);
#endif

6
clang/lib/Analysis/GRSimpleVals.h
View File

@ -21,6 +21,9 @@
namespace clang {
class PathDiagnostic;
class ASTContext;
class GRSimpleVals : public GRTransferFuncs {
public:
GRSimpleVals() {}
@ -58,6 +61,9 @@ public:
CallExpr* CE, LVal L,
ExplodedNode<ValueState>* Pred);
static void GeneratePathDiagnostic(PathDiagnostic& PD, ASTContext& Ctx,
ExplodedNode<ValueState>* N);
protected:
// Equality operators for LVals.