Header file cleanups: reduce number of includes; move ValueState.h into include directory tree.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@47661 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Analysis/GRExprEngine.cpp b/Analysis/GRExprEngine.cpp
index 13ae4fe..d2200bf 100644
--- a/Analysis/GRExprEngine.cpp
+++ b/Analysis/GRExprEngine.cpp
@@ -14,10 +14,13 @@
//===----------------------------------------------------------------------===//
#include "clang/Analysis/PathSensitive/GRExprEngine.h"
-#include "clang/Analysis/PathSensitive/GRTransferFuncs.h"
-
#include "llvm/Support/Streams.h"
+#ifndef NDEBUG
+#include "llvm/Support/GraphWriter.h"
+#include <sstream>
+#endif
+
using namespace clang;
using llvm::dyn_cast;
using llvm::cast;
diff --git a/Analysis/GRSimpleVals.cpp b/Analysis/GRSimpleVals.cpp
index 4d9dccf..b7ca830 100644
--- a/Analysis/GRSimpleVals.cpp
+++ b/Analysis/GRSimpleVals.cpp
@@ -14,7 +14,7 @@
//===----------------------------------------------------------------------===//
#include "GRSimpleVals.h"
-#include "ValueState.h"
+#include "clang/Analysis/PathSensitive/ValueState.h"
#include "clang/Basic/Diagnostic.h"
using namespace clang;
diff --git a/Analysis/ValueState.cpp b/Analysis/ValueState.cpp
index 97a090d..cdd616f 100644
--- a/Analysis/ValueState.cpp
+++ b/Analysis/ValueState.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "ValueState.h"
+#include "clang/Analysis/PathSensitive/ValueState.h"
#include "llvm/ADT/SmallSet.h"
using namespace clang;
diff --git a/include/clang/Analysis/PathSensitive/GRCoreEngine.h b/include/clang/Analysis/PathSensitive/GRCoreEngine.h
index f5ad870..d3325b1 100644
--- a/include/clang/Analysis/PathSensitive/GRCoreEngine.h
+++ b/include/clang/Analysis/PathSensitive/GRCoreEngine.h
@@ -21,7 +21,6 @@
#include "clang/Analysis/PathSensitive/GRBlockCounter.h"
#include "llvm/ADT/OwningPtr.h"
-
namespace clang {
class GRStmtNodeBuilderImpl;
diff --git a/include/clang/Analysis/PathSensitive/GRExprEngine.h b/include/clang/Analysis/PathSensitive/GRExprEngine.h
index 4945f31..16fd977 100644
--- a/include/clang/Analysis/PathSensitive/GRExprEngine.h
+++ b/include/clang/Analysis/PathSensitive/GRExprEngine.h
@@ -18,28 +18,6 @@
#include "clang/Analysis/PathSensitive/GRCoreEngine.h"
#include "clang/Analysis/PathSensitive/GRTransferFuncs.h"
-#include "clang/AST/Expr.h"
-#include "clang/AST/ASTContext.h"
-#include "clang/Analysis/Analyses/LiveVariables.h"
-#include "clang/Basic/Diagnostic.h"
-
-#include "llvm/Support/Casting.h"
-#include "llvm/Support/DataTypes.h"
-#include "llvm/ADT/APSInt.h"
-#include "llvm/ADT/FoldingSet.h"
-#include "llvm/ADT/ImmutableMap.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/Support/Allocator.h"
-#include "llvm/Support/Compiler.h"
-
-#include <functional>
-
-#ifndef NDEBUG
-#include "llvm/Support/GraphWriter.h"
-#include <sstream>
-#endif
-
namespace clang {
class GRExprEngine {
diff --git a/include/clang/Analysis/PathSensitive/ValueManager.h b/include/clang/Analysis/PathSensitive/ValueManager.h
index aa6ee9b..29d392c 100644
--- a/include/clang/Analysis/PathSensitive/ValueManager.h
+++ b/include/clang/Analysis/PathSensitive/ValueManager.h
@@ -25,8 +25,6 @@
}
namespace clang {
- class ASTContext;
-
class ValueManager {
typedef llvm::FoldingSet<llvm::FoldingSetNodeWrapper<llvm::APSInt> >
@@ -55,15 +53,13 @@
SourceLocation Loc = SourceLocation());
inline const llvm::APSInt& getZeroWithPtrWidth() {
- return getValue( 0,
- Ctx.getTypeSize(Ctx.VoidPtrTy, SourceLocation()),
- true );
+ return getValue(0, Ctx.getTypeSize(Ctx.VoidPtrTy, SourceLocation()), true);
}
inline const llvm::APSInt& getTruthValue(bool b) {
- return getValue( b ? 1 : 0,
+ return getValue(b ? 1 : 0,
Ctx.getTypeSize(Ctx.IntTy, SourceLocation()),
- false );
+ false);
}
const SymIntConstraint& getConstraint(SymbolID sym, BinaryOperator::Opcode Op,
diff --git a/Analysis/ValueState.h b/include/clang/Analysis/PathSensitive/ValueState.h
similarity index 100%
rename from Analysis/ValueState.h
rename to include/clang/Analysis/PathSensitive/ValueState.h