diff options
| -rw-r--r-- | include/clang/Checker/PathSensitive/Checker.h | 6 | ||||
| -rw-r--r-- | lib/Checker/ArrayBoundChecker.cpp | 12 | ||||
| -rw-r--r-- | lib/Checker/DereferenceChecker.cpp | 4 | ||||
| -rw-r--r-- | lib/Checker/GRExprEngine.cpp | 2 | ||||
| -rw-r--r-- | lib/Checker/MallocChecker.cpp | 4 |
5 files changed, 12 insertions, 16 deletions
diff --git a/include/clang/Checker/PathSensitive/Checker.h b/include/clang/Checker/PathSensitive/Checker.h index 7693983e3a..eb4d13069c 100644 --- a/include/clang/Checker/PathSensitive/Checker.h +++ b/include/clang/Checker/PathSensitive/Checker.h @@ -233,7 +233,7 @@ private: } // FIXME: Remove the 'tag' option. - void GR_VisitLocation(ExplodedNodeSet &Dst, + void GR_visitLocation(ExplodedNodeSet &Dst, GRStmtNodeBuilder &Builder, GRExprEngine &Eng, const Stmt *S, @@ -243,7 +243,7 @@ private: CheckerContext C(Dst, Builder, Eng, Pred, tag, isLoad ? ProgramPoint::PreLoadKind : ProgramPoint::PreStoreKind, 0, S, state); - VisitLocation(C, S, location); + visitLocation(C, S, location); } void GR_evalDeadSymbols(ExplodedNodeSet &Dst, GRStmtNodeBuilder &Builder, @@ -258,7 +258,7 @@ public: virtual ~Checker(); virtual void _PreVisit(CheckerContext &C, const Stmt *S) {} virtual void _PostVisit(CheckerContext &C, const Stmt *S) {} - virtual void VisitLocation(CheckerContext &C, const Stmt *S, SVal location) {} + virtual void visitLocation(CheckerContext &C, const Stmt *S, SVal location) {} virtual void PreVisitBind(CheckerContext &C, const Stmt *StoreE, SVal location, SVal val) {} virtual void evalDeadSymbols(CheckerContext &C, SymbolReaper &SymReaper) {} diff --git a/lib/Checker/ArrayBoundChecker.cpp b/lib/Checker/ArrayBoundChecker.cpp index 78c335cb3e..df21595a41 100644 --- a/lib/Checker/ArrayBoundChecker.cpp +++ b/lib/Checker/ArrayBoundChecker.cpp @@ -24,9 +24,9 @@ class ArrayBoundChecker : public CheckerVisitor<ArrayBoundChecker> { BuiltinBug *BT; public: - ArrayBoundChecker() : BT(0) {} - static void *getTag(); - void VisitLocation(CheckerContext &C, const Stmt *S, SVal l); + ArrayBoundChecker() : BT(0) {} + static void *getTag() { static int x = 0; return &x; } + void visitLocation(CheckerContext &C, const Stmt *S, SVal l); }; } @@ -34,11 +34,7 @@ void clang::RegisterArrayBoundChecker(GRExprEngine &Eng) { Eng.registerCheck(new ArrayBoundChecker()); } -void *ArrayBoundChecker::getTag() { - static int x = 0; return &x; -} - -void ArrayBoundChecker::VisitLocation(CheckerContext &C, const Stmt *S, SVal l){ +void ArrayBoundChecker::visitLocation(CheckerContext &C, const Stmt *S, SVal l){ // Check for out of bound array element access. const MemRegion *R = l.getAsRegion(); if (!R) diff --git a/lib/Checker/DereferenceChecker.cpp b/lib/Checker/DereferenceChecker.cpp index 0f75cc00bc..5938ca1824 100644 --- a/lib/Checker/DereferenceChecker.cpp +++ b/lib/Checker/DereferenceChecker.cpp @@ -28,7 +28,7 @@ class DereferenceChecker : public Checker { public: DereferenceChecker() : BT_null(0), BT_undef(0) {} static void *getTag() { static int tag = 0; return &tag; } - void VisitLocation(CheckerContext &C, const Stmt *S, SVal location); + void visitLocation(CheckerContext &C, const Stmt *S, SVal location); std::pair<ExplodedNode * const*, ExplodedNode * const*> getImplicitNodes() const { @@ -83,7 +83,7 @@ void DereferenceChecker::AddDerefSource(llvm::raw_ostream &os, } } -void DereferenceChecker::VisitLocation(CheckerContext &C, const Stmt *S, +void DereferenceChecker::visitLocation(CheckerContext &C, const Stmt *S, SVal l) { // Check for dereference of an undefined value. if (l.isUndef()) { diff --git a/lib/Checker/GRExprEngine.cpp b/lib/Checker/GRExprEngine.cpp index f50fa66bea..2945de162a 100644 --- a/lib/Checker/GRExprEngine.cpp +++ b/lib/Checker/GRExprEngine.cpp @@ -1854,7 +1854,7 @@ void GRExprEngine::evalLocation(ExplodedNodeSet &Dst, const Stmt *S, NI != NE; ++NI) { // Use the 'state' argument only when the predecessor node is the // same as Pred. This allows us to catch updates to the state. - checker->GR_VisitLocation(*CurrSet, *Builder, *this, S, *NI, + checker->GR_visitLocation(*CurrSet, *Builder, *this, S, *NI, *NI == Pred ? state : GetState(*NI), location, tag, isLoad); } diff --git a/lib/Checker/MallocChecker.cpp b/lib/Checker/MallocChecker.cpp index e6dae7ff72..3cc3670645 100644 --- a/lib/Checker/MallocChecker.cpp +++ b/lib/Checker/MallocChecker.cpp @@ -81,7 +81,7 @@ public: void PreVisitReturnStmt(CheckerContext &C, const ReturnStmt *S); const GRState *evalAssume(const GRState *state, SVal Cond, bool Assumption, bool *respondsToCallback); - void VisitLocation(CheckerContext &C, const Stmt *S, SVal l); + void visitLocation(CheckerContext &C, const Stmt *S, SVal l); virtual void PreVisitBind(CheckerContext &C, const Stmt *StoreE, SVal location, SVal val); @@ -650,7 +650,7 @@ const GRState *MallocChecker::evalAssume(const GRState *state, SVal Cond, } // Check if the location is a freed symbolic region. -void MallocChecker::VisitLocation(CheckerContext &C, const Stmt *S, SVal l) { +void MallocChecker::visitLocation(CheckerContext &C, const Stmt *S, SVal l) { SymbolRef Sym = l.getLocSymbolInBase(); if (Sym) { const RefState *RS = C.getState()->get<RegionState>(Sym); |