Header file cleanups: reduce number of includes; move ValueState.h into include direc...

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 13ae4febf9dab1b6c28288c666f14ab84fb56cef..d2200bfa0fef04bdc3969b4346055cb4cd64c50f 100644 (file)
--- 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 4d9dccf621e0b6f41c745028c9a656b10bce2e14..b7ca8301bee9bca83fde752ee11af42bc27905e3 100644 (file)
--- 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 97a090dad7031fde589c3f9da58b2a7719e7d0cb..cdd616fb147a96dc1265b4e13d66c90d8d53cb35 100644 (file)
--- 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 f5ad8700ffa3218d65bc4815eb0fa28b8425126b..d3325b1b128d78b79f1a640238811e75f966ee84 100644 (file)
--- 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 4945f3107afdcc7c83ce6af912e5d438c5f76f70..16fd977105005d372ba6e1053cdc1654cf5318d5 100644 (file)
--- 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 aa6ee9baa63d31cc3a2e4dfa34baf851047c3738..29d392cda65020a5226b6fdc0914c09629a4e46f 100644 (file)
--- a/include/clang/Analysis/PathSensitive/ValueManager.h
+++ b/include/clang/Analysis/PathSensitive/ValueManager.h
@@ -25,8 +25,6 @@ namespace llvm {
 }
 
 namespace clang {
-  class ASTContext;
-  
   
 class ValueManager {
   typedef llvm::FoldingSet<llvm::FoldingSetNodeWrapper<llvm::APSInt> >
@@ -55,15 +53,13 @@ public:
                                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