aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Analysis/DeadStores.cpp7
-rw-r--r--Analysis/LiveVariables.cpp15
-rw-r--r--Driver/ASTConsumers.cpp4
-rw-r--r--include/clang/Analysis/Analyses/LiveVariables.h2
-rw-r--r--include/clang/Analysis/LocalCheckers.h3
-rw-r--r--include/clang/Analysis/PathSensitive/GRExprEngine.h2
-rw-r--r--include/clang/Analysis/Support/ExprDeclBitVector.h36
7 files changed, 43 insertions, 26 deletions
diff --git a/Analysis/DeadStores.cpp b/Analysis/DeadStores.cpp
index 0c05484432..0848336e58 100644
--- a/Analysis/DeadStores.cpp
+++ b/Analysis/DeadStores.cpp
@@ -76,13 +76,12 @@ public:
namespace clang {
-void CheckDeadStores(CFG& cfg, FunctionDecl& FD, ASTContext &Ctx,
- Diagnostic &Diags) {
+void CheckDeadStores(CFG& cfg, ASTContext &Ctx, Diagnostic &Diags) {
- LiveVariables L(cfg, FD);
+ LiveVariables L(cfg);
L.runOnCFG(cfg);
DeadStoreObs A(Ctx, Diags);
- L.runOnAllBlocks(cfg,&A);
+ L.runOnAllBlocks(cfg, &A);
}
} // end namespace clang
diff --git a/Analysis/LiveVariables.cpp b/Analysis/LiveVariables.cpp
index 52f7f4d19b..e59a488591 100644
--- a/Analysis/LiveVariables.cpp
+++ b/Analysis/LiveVariables.cpp
@@ -43,14 +43,9 @@ public:
} // end anonymous namespace
-LiveVariables::LiveVariables(CFG& cfg, FunctionDecl& FD) {
+LiveVariables::LiveVariables(CFG& cfg) {
+ // Register all referenced VarDecls.
getAnalysisData().setCFG(&cfg);
-
- for (FunctionDecl::param_iterator I=FD.param_begin(), E=FD.param_end();
- I !=E; ++I)
- getAnalysisData().Register(*I);
-
- // Now register all the other VarDecls;
RegisterDecls R(getAnalysisData());
cfg.VisitBlockStmts(R);
}
@@ -201,11 +196,13 @@ void LiveVariables::runOnAllBlocks(const CFG& cfg,
//
bool LiveVariables::isLive(const CFGBlock* B, const VarDecl* D) const {
- return getBlockData(B)(D,getAnalysisData());
+ DeclBitVector_Types::Idx i = getAnalysisData().getIdx(D);
+ return i.isValid() ? getBlockData(B).getBit(i) : false;
}
bool LiveVariables::isLive(const ValTy& Live, const VarDecl* D) const {
- return Live(D,getAnalysisData());
+ DeclBitVector_Types::Idx i = getAnalysisData().getIdx(D);
+ return i.isValid() ? Live.getBit(i) : false;
}
bool LiveVariables::isLive(const Stmt* Loc, const Stmt* StmtVal) const {
diff --git a/Driver/ASTConsumers.cpp b/Driver/ASTConsumers.cpp
index 1e40495815..8e99878f66 100644
--- a/Driver/ASTConsumers.cpp
+++ b/Driver/ASTConsumers.cpp
@@ -528,7 +528,7 @@ namespace {
}
virtual void VisitCFG(CFG& C, FunctionDecl& FD) {
- LiveVariables L(C, FD);
+ LiveVariables L(C);
L.runOnCFG(C);
L.dumpBlockLiveness(*SM);
}
@@ -553,7 +553,7 @@ namespace {
}
virtual void VisitCFG(CFG& C, FunctionDecl& FD) {
- CheckDeadStores(C, FD, *Ctx, Diags);
+ CheckDeadStores(C, *Ctx, Diags);
}
virtual bool printFuncDeclStart() { return false; }
diff --git a/include/clang/Analysis/Analyses/LiveVariables.h b/include/clang/Analysis/Analyses/LiveVariables.h
index c048cbbc4e..f172df62e8 100644
--- a/include/clang/Analysis/Analyses/LiveVariables.h
+++ b/include/clang/Analysis/Analyses/LiveVariables.h
@@ -64,7 +64,7 @@ class LiveVariables : public DataflowValues<LiveVariables_ValueTypes,
public:
typedef LiveVariables_ValueTypes::ObserverTy ObserverTy;
- LiveVariables(CFG& cfg, FunctionDecl& FD);
+ LiveVariables(CFG& cfg);
/// IsLive - Return true if a variable is live at beginning of a
/// specified block.
diff --git a/include/clang/Analysis/LocalCheckers.h b/include/clang/Analysis/LocalCheckers.h
index 510e9a3cde..3ae41f4ce9 100644
--- a/include/clang/Analysis/LocalCheckers.h
+++ b/include/clang/Analysis/LocalCheckers.h
@@ -22,8 +22,7 @@ class FunctionDecl;
class Diagnostic;
class ASTContext;
-void CheckDeadStores(CFG& cfg, FunctionDecl& FD, ASTContext &Ctx,
- Diagnostic &Diags);
+void CheckDeadStores(CFG& cfg, ASTContext &Ctx, Diagnostic &Diags);
void CheckUninitializedValues(CFG& cfg, ASTContext& Ctx, Diagnostic& Diags,
bool FullUninitTaint=false);
diff --git a/include/clang/Analysis/PathSensitive/GRExprEngine.h b/include/clang/Analysis/PathSensitive/GRExprEngine.h
index 405dada995..0c3aa847e6 100644
--- a/include/clang/Analysis/PathSensitive/GRExprEngine.h
+++ b/include/clang/Analysis/PathSensitive/GRExprEngine.h
@@ -126,7 +126,7 @@ protected:
public:
GRExprEngine(GraphTy& g) :
- G(g), Liveness(G.getCFG(), G.getFunctionDecl()),
+ G(g), Liveness(G.getCFG()),
Builder(NULL),
StateMgr(G.getContext(), G.getAllocator()),
BasicVals(StateMgr.getBasicValueFactory()),
diff --git a/include/clang/Analysis/Support/ExprDeclBitVector.h b/include/clang/Analysis/Support/ExprDeclBitVector.h
index dc634df5ed..558331e32e 100644
--- a/include/clang/Analysis/Support/ExprDeclBitVector.h
+++ b/include/clang/Analysis/Support/ExprDeclBitVector.h
@@ -28,6 +28,21 @@ namespace clang {
struct DeclBitVector_Types {
+ class Idx {
+ unsigned I;
+ public:
+ Idx(unsigned i) : I(i) {}
+ explicit Idx() : I(~0U) {}
+
+ bool isValid() const {
+ return I != ~0U;
+ }
+ operator unsigned() const {
+ assert (isValid());
+ return I;
+ }
+ };
+
//===--------------------------------------------------------------------===//
// AnalysisDataTy - Whole-function meta data.
//===--------------------------------------------------------------------===//
@@ -48,10 +63,9 @@ struct DeclBitVector_Types {
bool isTracked(const ScopedDecl* SD) { return DMap.find(SD) != DMap.end(); }
- unsigned getIdx(const ScopedDecl* SD) const {
+ Idx getIdx(const ScopedDecl* SD) const {
DMapTy::const_iterator I = DMap.find(SD);
- assert (I != DMap.end());
- return I->second;
+ return I == DMap.end() ? Idx() : Idx(I->second);
}
unsigned getNumDecls() const { return NDecls; }
@@ -84,13 +98,21 @@ struct DeclBitVector_Types {
void copyValues(const ValTy& RHS) { DeclBV = RHS.DeclBV; }
+ llvm::BitVector::reference getBit(unsigned i) {
+ return DeclBV[i];
+ }
+
+ const bool getBit(unsigned i) const {
+ return DeclBV[i];
+ }
+
llvm::BitVector::reference
operator()(const ScopedDecl* SD, const AnalysisDataTy& AD) {
- return DeclBV[AD.getIdx(SD)];
+ return getBit(AD.getIdx(SD));
}
- const llvm::BitVector::reference
- operator()(const ScopedDecl* SD, const AnalysisDataTy& AD) const {
- return const_cast<ValTy&>(*this)(SD,AD);
+
+ bool operator()(const ScopedDecl* SD, const AnalysisDataTy& AD) const {
+ return getBit(AD.getIdx(SD));
}
llvm::BitVector::reference getDeclBit(unsigned i) { return DeclBV[i]; }
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-08-03 15:24:34 +0000