diff options
| author | Tom Care <tom.care@uqconnect.edu.au> | 2010-09-14 21:35:27 +0000 |
|---|---|---|
| committer | Tom Care <tom.care@uqconnect.edu.au> | 2010-09-14 21:35:27 +0000 |
| commit | 68625cf3eef2a6948fe42134aeeda91ed15e63d3 (patch) | |
| tree | a3259e848406e0c3d511af592269c4d2370cfd59 | |
| parent | edeb6c9b47e802da1a9a149ea1ea4f1ddd7f6182 (diff) | |
Rename 'MaxLoop' to 'MaxVisit' in AnalysisManager to more correctly reflect that we aborted analysis may not necessarily be due to a loop.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@113862 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | examples/wpa/clang-wpa.cpp | 2 | ||||
| -rw-r--r-- | include/clang/Checker/PathSensitive/AnalysisManager.h | 10 | ||||
| -rw-r--r-- | lib/Checker/GRCoreEngine.cpp | 2 | ||||
| -rw-r--r-- | lib/Checker/GRExprEngine.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/examples/wpa/clang-wpa.cpp b/examples/wpa/clang-wpa.cpp index 41dca0dc45..79afbbd273 100644 --- a/examples/wpa/clang-wpa.cpp +++ b/examples/wpa/clang-wpa.cpp @@ -134,7 +134,7 @@ int main(int argc, char **argv) { PP.getLangOptions(), /* PathDiagnostic */ 0, CreateRegionStoreManager, CreateRangeConstraintManager, &Idxer, - /* MaxNodes */ 300000, /* MaxLoop */ 3, + /* MaxNodes */ 300000, /* MaxVisit */ 3, /* VisualizeEG */ false, /* VisualizeEGUbi */ false, /* PurgeDead */ true, /* EagerlyAssume */ false, /* TrimGraph */ false, /* InlineCall */ true, diff --git a/include/clang/Checker/PathSensitive/AnalysisManager.h b/include/clang/Checker/PathSensitive/AnalysisManager.h index 38550798b8..628ddce31c 100644 --- a/include/clang/Checker/PathSensitive/AnalysisManager.h +++ b/include/clang/Checker/PathSensitive/AnalysisManager.h @@ -50,8 +50,8 @@ class AnalysisManager : public BugReporterData { // The maximum number of exploded nodes the analyzer will generate. unsigned MaxNodes; - // The maximum number of times the analyzer will go through a loop. - unsigned MaxLoop; + // The maximum number of times the analyzer visit a block. + unsigned MaxVisit; bool VisualizeEGDot; bool VisualizeEGUbi; @@ -74,14 +74,14 @@ public: StoreManagerCreator storemgr, ConstraintManagerCreator constraintmgr, idx::Indexer *idxer, - unsigned maxnodes, unsigned maxloop, + unsigned maxnodes, unsigned maxvisit, bool vizdot, bool vizubi, bool purge, bool eager, bool trim, bool inlinecall, bool useUnoptimizedCFG) : AnaCtxMgr(useUnoptimizedCFG), Ctx(ctx), Diags(diags), LangInfo(lang), PD(pd), CreateStoreMgr(storemgr), CreateConstraintMgr(constraintmgr),Idxer(idxer), - AScope(ScopeDecl), MaxNodes(maxnodes), MaxLoop(maxloop), + AScope(ScopeDecl), MaxNodes(maxnodes), MaxVisit(maxvisit), VisualizeEGDot(vizdot), VisualizeEGUbi(vizubi), PurgeDead(purge), EagerlyAssume(eager), TrimGraph(trim), InlineCall(inlinecall) {} @@ -133,7 +133,7 @@ public: unsigned getMaxNodes() const { return MaxNodes; } - unsigned getMaxLoop() const { return MaxLoop; } + unsigned getMaxVisit() const { return MaxVisit; } bool shouldVisualizeGraphviz() const { return VisualizeEGDot; } diff --git a/lib/Checker/GRCoreEngine.cpp b/lib/Checker/GRCoreEngine.cpp index 5125f366de..6b7a2cb812 100644 --- a/lib/Checker/GRCoreEngine.cpp +++ b/lib/Checker/GRCoreEngine.cpp @@ -703,7 +703,7 @@ void GRCallEnterNodeBuilder::GenerateNode(const GRState *state, OldMgr.getStoreManagerCreator(), OldMgr.getConstraintManagerCreator(), OldMgr.getIndexer(), - OldMgr.getMaxNodes(), OldMgr.getMaxLoop(), + OldMgr.getMaxNodes(), OldMgr.getMaxVisit(), OldMgr.shouldVisualizeGraphviz(), OldMgr.shouldVisualizeUbigraph(), OldMgr.shouldPurgeDead(), diff --git a/lib/Checker/GRExprEngine.cpp b/lib/Checker/GRExprEngine.cpp index 39a5cc1fa9..bead4e1c1a 100644 --- a/lib/Checker/GRExprEngine.cpp +++ b/lib/Checker/GRExprEngine.cpp @@ -1213,7 +1213,7 @@ bool GRExprEngine::ProcessBlockEntrance(const CFGBlock* B, const ExplodedNode *Pred, GRBlockCounter BC) { return BC.getNumVisited(Pred->getLocationContext()->getCurrentStackFrame(), - B->getBlockID()) < AMgr.getMaxLoop(); + B->getBlockID()) < AMgr.getMaxVisit(); } //===----------------------------------------------------------------------===// |