From c88ed9561e07fcbf48f22e67bdbcd8f00f6f7528 Mon Sep 17 00:00:00 2001
From: Tom Care <tom.care@uqconnect.edu.au>
Date: Tue, 14 Sep 2010 21:35:27 +0000
Subject: [PATCH] Rename 'MaxLoop' to 'MaxVisit' in AnalysisManager to more
 correctly reflect that we aborted analysis may not necessarily be due to a
 loop.

llvm-svn: 113862
---
 clang/examples/wpa/clang-wpa.cpp                       |  2 +-
 .../clang/Checker/PathSensitive/AnalysisManager.h      | 10 +++++-----
 clang/lib/Checker/GRCoreEngine.cpp                     |  2 +-
 clang/lib/Checker/GRExprEngine.cpp                     |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/clang/examples/wpa/clang-wpa.cpp b/clang/examples/wpa/clang-wpa.cpp
index 41dca0dc451e..79afbbd2732d 100644
--- a/clang/examples/wpa/clang-wpa.cpp
+++ b/clang/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/clang/include/clang/Checker/PathSensitive/AnalysisManager.h b/clang/include/clang/Checker/PathSensitive/AnalysisManager.h
index 38550798b812..628ddce31ce4 100644
--- a/clang/include/clang/Checker/PathSensitive/AnalysisManager.h
+++ b/clang/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/clang/lib/Checker/GRCoreEngine.cpp b/clang/lib/Checker/GRCoreEngine.cpp
index 5125f366de2a..6b7a2cb81216 100644
--- a/clang/lib/Checker/GRCoreEngine.cpp
+++ b/clang/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/clang/lib/Checker/GRExprEngine.cpp b/clang/lib/Checker/GRExprEngine.cpp
index 39a5cc1fa9cf..bead4e1c1a53 100644
--- a/clang/lib/Checker/GRExprEngine.cpp
+++ b/clang/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();
 }
 
 //===----------------------------------------------------------------------===//
-- 
GitLab