Rename header file.
Update include files.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@59284 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Analysis/Analyses/LiveVariables.h b/include/clang/Analysis/Analyses/LiveVariables.h
index 6571c73..451e202 100644
--- a/include/clang/Analysis/Analyses/LiveVariables.h
+++ b/include/clang/Analysis/Analyses/LiveVariables.h
@@ -15,7 +15,7 @@
#define LLVM_CLANG_LIVEVARIABLES_H
#include "clang/AST/Decl.h"
-#include "clang/Analysis/Support/ExprDeclBitVector.h"
+#include "clang/Analysis/Support/BlkExprDeclBitVector.h"
#include "clang/Analysis/FlowSensitive/DataflowValues.h"
namespace clang {
@@ -29,14 +29,14 @@
struct ObserverTy;
// We keep dataflow state for declarations and block-level expressions;
- typedef ExprDeclBitVector_Types::ValTy ValTy;
+ typedef StmtDeclBitVector_Types::ValTy ValTy;
// We need to keep track of both declarations and CFGBlock-level expressions,
// (so that we don't explore such expressions twice). We also want
// to compute liveness information for block-level expressions, since these
// act as "temporary" values.
- struct AnalysisDataTy : public ExprDeclBitVector_Types::AnalysisDataTy {
+ struct AnalysisDataTy : public StmtDeclBitVector_Types::AnalysisDataTy {
ObserverTy* Observer;
ValTy AlwaysLive;
diff --git a/include/clang/Analysis/Analyses/UninitializedValues.h b/include/clang/Analysis/Analyses/UninitializedValues.h
index ea7bd14..33205d0 100644
--- a/include/clang/Analysis/Analyses/UninitializedValues.h
+++ b/include/clang/Analysis/Analyses/UninitializedValues.h
@@ -15,7 +15,7 @@
#ifndef LLVM_CLANG_UNITVALS_H
#define LLVM_CLANG_UNITVALS_H
-#include "clang/Analysis/Support/ExprDeclBitVector.h"
+#include "clang/Analysis/Support/BlkExprDeclBitVector.h"
#include "clang/Analysis/FlowSensitive/DataflowValues.h"
namespace clang {
@@ -33,7 +33,7 @@
struct ObserverTy;
- struct AnalysisDataTy : public ExprDeclBitVector_Types::AnalysisDataTy {
+ struct AnalysisDataTy : public StmtDeclBitVector_Types::AnalysisDataTy {
AnalysisDataTy() : Observer(NULL), FullUninitTaint(true) {}
virtual ~AnalysisDataTy() {};
@@ -41,7 +41,7 @@
bool FullUninitTaint;
};
- typedef ExprDeclBitVector_Types::ValTy ValTy;
+ typedef StmtDeclBitVector_Types::ValTy ValTy;
//===--------------------------------------------------------------------===//
// ObserverTy - Observer for querying DeclRefExprs that use an uninitalized
diff --git a/include/clang/Analysis/Support/ExprDeclBitVector.h b/include/clang/Analysis/Support/BlkExprDeclBitVector.h
similarity index 100%
rename from include/clang/Analysis/Support/ExprDeclBitVector.h
rename to include/clang/Analysis/Support/BlkExprDeclBitVector.h
diff --git a/lib/Analysis/LiveVariables.cpp b/lib/Analysis/LiveVariables.cpp
index 03a4bc7..98b1ee2 100644
--- a/lib/Analysis/LiveVariables.cpp
+++ b/lib/Analysis/LiveVariables.cpp
@@ -276,11 +276,11 @@
namespace {
struct Merge {
- typedef ExprDeclBitVector_Types::ValTy ValTy;
+ typedef StmtDeclBitVector_Types::ValTy ValTy;
void operator()(ValTy& Dst, const ValTy& Src) {
Dst.OrDeclBits(Src);
- Dst.AndExprBits(Src);
+ Dst.AndBlkExprBits(Src);
}
};
diff --git a/lib/Analysis/UninitializedValues.cpp b/lib/Analysis/UninitializedValues.cpp
index 0e4a387..b673713 100644
--- a/lib/Analysis/UninitializedValues.cpp
+++ b/lib/Analysis/UninitializedValues.cpp
@@ -65,7 +65,7 @@
void SetTopValue(UninitializedValues::ValTy& X) {
X.setDeclValues(AD);
- X.resetExprValues(AD);
+ X.resetBlkExprValues(AD);
}
bool VisitDeclRefExpr(DeclRefExpr* DR);
@@ -251,7 +251,7 @@
//===----------------------------------------------------------------------===//
namespace {
- typedef ExprDeclBitVector_Types::Union Merge;
+ typedef StmtDeclBitVector_Types::Union Merge;
typedef DataflowSolver<UninitializedValues,TransferFuncs,Merge> Solver;
}