aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorArgyrios Kyrtzidis <akyrtzi@gmail.com>2010-12-22 18:51:49 +0000
committerArgyrios Kyrtzidis <akyrtzi@gmail.com>2010-12-22 18:51:49 +0000
commit98cabbad47a4d9db6b7e95c950d3302c110d1b02 (patch)
tree4b1b4ecb09e22214a5d4f08f49427116b3a9e7a4 /include
parent20a55e2515ce89ddf9993941f9b5d0f3a6c91b4f (diff)
[analyzer] Refactoring: include/clang/Checker -> include/clang/GR
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@122420 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
-rw-r--r--include/clang/GR/AnalysisConsumer.h (renamed from include/clang/Checker/AnalysisConsumer.h)0
-rw-r--r--include/clang/GR/BugReporter/BugReporter.h (renamed from include/clang/Checker/BugReporter/BugReporter.h)2
-rw-r--r--include/clang/GR/BugReporter/BugType.h (renamed from include/clang/Checker/BugReporter/BugType.h)2
-rw-r--r--include/clang/GR/BugReporter/PathDiagnostic.h (renamed from include/clang/Checker/BugReporter/PathDiagnostic.h)0
-rw-r--r--include/clang/GR/Checkers/DereferenceChecker.h (renamed from include/clang/Checker/Checkers/DereferenceChecker.h)0
-rw-r--r--include/clang/GR/Checkers/LocalCheckers.h (renamed from include/clang/Checker/Checkers/LocalCheckers.h)0
-rw-r--r--include/clang/GR/FrontendActions.h (renamed from include/clang/Checker/FrontendActions.h)0
-rw-r--r--include/clang/GR/ManagerRegistry.h (renamed from include/clang/Checker/ManagerRegistry.h)2
-rw-r--r--include/clang/GR/PathDiagnosticClients.h (renamed from include/clang/Checker/PathDiagnosticClients.h)0
-rw-r--r--include/clang/GR/PathSensitive/AnalysisManager.h (renamed from include/clang/Checker/PathSensitive/AnalysisManager.h)4
-rw-r--r--include/clang/GR/PathSensitive/BasicValueFactory.h (renamed from include/clang/Checker/PathSensitive/BasicValueFactory.h)2
-rw-r--r--include/clang/GR/PathSensitive/Checker.h (renamed from include/clang/Checker/PathSensitive/Checker.h)2
-rw-r--r--include/clang/GR/PathSensitive/CheckerHelpers.h (renamed from include/clang/Checker/PathSensitive/CheckerHelpers.h)0
-rw-r--r--include/clang/GR/PathSensitive/CheckerVisitor.def (renamed from include/clang/Checker/PathSensitive/CheckerVisitor.def)0
-rw-r--r--include/clang/GR/PathSensitive/CheckerVisitor.h (renamed from include/clang/Checker/PathSensitive/CheckerVisitor.h)8
-rw-r--r--include/clang/GR/PathSensitive/ConstraintManager.h (renamed from include/clang/Checker/PathSensitive/ConstraintManager.h)2
-rw-r--r--include/clang/GR/PathSensitive/Environment.h (renamed from include/clang/Checker/PathSensitive/Environment.h)4
-rw-r--r--include/clang/GR/PathSensitive/ExplodedGraph.h (renamed from include/clang/Checker/PathSensitive/ExplodedGraph.h)0
-rw-r--r--include/clang/GR/PathSensitive/GRBlockCounter.h (renamed from include/clang/Checker/PathSensitive/GRBlockCounter.h)0
-rw-r--r--include/clang/GR/PathSensitive/GRCoreEngine.h (renamed from include/clang/Checker/PathSensitive/GRCoreEngine.h)8
-rw-r--r--include/clang/GR/PathSensitive/GRExprEngine.h (renamed from include/clang/Checker/PathSensitive/GRExprEngine.h)12
-rw-r--r--include/clang/GR/PathSensitive/GRExprEngineBuilders.h (renamed from include/clang/Checker/PathSensitive/GRExprEngineBuilders.h)2
-rw-r--r--include/clang/GR/PathSensitive/GRState.h (renamed from include/clang/Checker/PathSensitive/GRState.h)8
-rw-r--r--include/clang/GR/PathSensitive/GRStateTrait.h (renamed from include/clang/Checker/PathSensitive/GRStateTrait.h)0
-rw-r--r--include/clang/GR/PathSensitive/GRSubEngine.h (renamed from include/clang/Checker/PathSensitive/GRSubEngine.h)2
-rw-r--r--include/clang/GR/PathSensitive/GRTransferFuncs.h (renamed from include/clang/Checker/PathSensitive/GRTransferFuncs.h)4
-rw-r--r--include/clang/GR/PathSensitive/GRWorkList.h (renamed from include/clang/Checker/PathSensitive/GRWorkList.h)2
-rw-r--r--include/clang/GR/PathSensitive/MemRegion.h (renamed from include/clang/Checker/PathSensitive/MemRegion.h)2
-rw-r--r--include/clang/GR/PathSensitive/SValBuilder.h (renamed from include/clang/Checker/PathSensitive/SValBuilder.h)6
-rw-r--r--include/clang/GR/PathSensitive/SVals.h (renamed from include/clang/Checker/PathSensitive/SVals.h)2
-rw-r--r--include/clang/GR/PathSensitive/Store.h (renamed from include/clang/Checker/PathSensitive/Store.h)4
-rw-r--r--include/clang/GR/PathSensitive/SummaryManager.h (renamed from include/clang/Checker/PathSensitive/SummaryManager.h)0
-rw-r--r--include/clang/GR/PathSensitive/SymbolManager.h (renamed from include/clang/Checker/PathSensitive/SymbolManager.h)0
33 files changed, 40 insertions, 40 deletions
diff --git a/include/clang/Checker/AnalysisConsumer.h b/include/clang/GR/AnalysisConsumer.h
index c236766f0a..c236766f0a 100644
--- a/include/clang/Checker/AnalysisConsumer.h
+++ b/include/clang/GR/AnalysisConsumer.h
diff --git a/include/clang/Checker/BugReporter/BugReporter.h b/include/clang/GR/BugReporter/BugReporter.h
index 031693d6d7..0b23ae61e8 100644
--- a/include/clang/Checker/BugReporter/BugReporter.h
+++ b/include/clang/GR/BugReporter/BugReporter.h
@@ -16,7 +16,7 @@
#define LLVM_CLANG_ANALYSIS_BUGREPORTER
#include "clang/Basic/SourceLocation.h"
-#include "clang/Checker/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/GRState.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/ImmutableList.h"
#include "llvm/ADT/ImmutableSet.h"
diff --git a/include/clang/Checker/BugReporter/BugType.h b/include/clang/GR/BugReporter/BugType.h
index afc07c89e8..8d105bfc61 100644
--- a/include/clang/Checker/BugReporter/BugType.h
+++ b/include/clang/GR/BugReporter/BugType.h
@@ -14,7 +14,7 @@
#ifndef LLVM_CLANG_ANALYSIS_BUGTYPE
#define LLVM_CLANG_ANALYSIS_BUGTYPE
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/GR/BugReporter/BugReporter.h"
#include "llvm/ADT/FoldingSet.h"
#include <string>
diff --git a/include/clang/Checker/BugReporter/PathDiagnostic.h b/include/clang/GR/BugReporter/PathDiagnostic.h
index 24c75ce7b2..24c75ce7b2 100644
--- a/include/clang/Checker/BugReporter/PathDiagnostic.h
+++ b/include/clang/GR/BugReporter/PathDiagnostic.h
diff --git a/include/clang/Checker/Checkers/DereferenceChecker.h b/include/clang/GR/Checkers/DereferenceChecker.h
index a84183e7f2..a84183e7f2 100644
--- a/include/clang/Checker/Checkers/DereferenceChecker.h
+++ b/include/clang/GR/Checkers/DereferenceChecker.h
diff --git a/include/clang/Checker/Checkers/LocalCheckers.h b/include/clang/GR/Checkers/LocalCheckers.h
index 4a9e381a7c..4a9e381a7c 100644
--- a/include/clang/Checker/Checkers/LocalCheckers.h
+++ b/include/clang/GR/Checkers/LocalCheckers.h
diff --git a/include/clang/Checker/FrontendActions.h b/include/clang/GR/FrontendActions.h
index 1c0bbb78ba..1c0bbb78ba 100644
--- a/include/clang/Checker/FrontendActions.h
+++ b/include/clang/GR/FrontendActions.h
diff --git a/include/clang/Checker/ManagerRegistry.h b/include/clang/GR/ManagerRegistry.h
index ebfd28e109..1266c7900d 100644
--- a/include/clang/Checker/ManagerRegistry.h
+++ b/include/clang/GR/ManagerRegistry.h
@@ -14,7 +14,7 @@
#ifndef LLVM_CLANG_ANALYSIS_MANAGER_REGISTRY_H
#define LLVM_CLANG_ANALYSIS_MANAGER_REGISTRY_H
-#include "clang/Checker/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/GRState.h"
namespace clang {
diff --git a/include/clang/Checker/PathDiagnosticClients.h b/include/clang/GR/PathDiagnosticClients.h
index a0360102e7..a0360102e7 100644
--- a/include/clang/Checker/PathDiagnosticClients.h
+++ b/include/clang/GR/PathDiagnosticClients.h
diff --git a/include/clang/Checker/PathSensitive/AnalysisManager.h b/include/clang/GR/PathSensitive/AnalysisManager.h
index 473772b82e..42221f2a53 100644
--- a/include/clang/Checker/PathSensitive/AnalysisManager.h
+++ b/include/clang/GR/PathSensitive/AnalysisManager.h
@@ -16,8 +16,8 @@
#define LLVM_CLANG_ANALYSIS_ANALYSISMANAGER_H
#include "clang/Analysis/AnalysisContext.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/Checker/BugReporter/PathDiagnostic.h"
+#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/GR/BugReporter/PathDiagnostic.h"
namespace clang {
diff --git a/include/clang/Checker/PathSensitive/BasicValueFactory.h b/include/clang/GR/PathSensitive/BasicValueFactory.h
index c9518cc5ed..846082e504 100644
--- a/include/clang/Checker/PathSensitive/BasicValueFactory.h
+++ b/include/clang/GR/PathSensitive/BasicValueFactory.h
@@ -16,7 +16,7 @@
#ifndef LLVM_CLANG_ANALYSIS_BASICVALUEFACTORY_H
#define LLVM_CLANG_ANALYSIS_BASICVALUEFACTORY_H
-#include "clang/Checker/PathSensitive/SVals.h"
+#include "clang/GR/PathSensitive/SVals.h"
#include "clang/AST/ASTContext.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/APSInt.h"
diff --git a/include/clang/Checker/PathSensitive/Checker.h b/include/clang/GR/PathSensitive/Checker.h
index eb4d13069c..4e4cd58555 100644
--- a/include/clang/Checker/PathSensitive/Checker.h
+++ b/include/clang/GR/PathSensitive/Checker.h
@@ -16,7 +16,7 @@
#define LLVM_CLANG_ANALYSIS_CHECKER
#include "clang/Analysis/Support/SaveAndRestore.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
//===----------------------------------------------------------------------===//
// Checker interface.
diff --git a/include/clang/Checker/PathSensitive/CheckerHelpers.h b/include/clang/GR/PathSensitive/CheckerHelpers.h
index ea3c842ffc..ea3c842ffc 100644
--- a/include/clang/Checker/PathSensitive/CheckerHelpers.h
+++ b/include/clang/GR/PathSensitive/CheckerHelpers.h
diff --git a/include/clang/Checker/PathSensitive/CheckerVisitor.def b/include/clang/GR/PathSensitive/CheckerVisitor.def
index 3ee8071985..3ee8071985 100644
--- a/include/clang/Checker/PathSensitive/CheckerVisitor.def
+++ b/include/clang/GR/PathSensitive/CheckerVisitor.def
diff --git a/include/clang/Checker/PathSensitive/CheckerVisitor.h b/include/clang/GR/PathSensitive/CheckerVisitor.h
index 241d9e39ad..9980ac93dd 100644
--- a/include/clang/Checker/PathSensitive/CheckerVisitor.h
+++ b/include/clang/GR/PathSensitive/CheckerVisitor.h
@@ -13,7 +13,7 @@
#ifndef LLVM_CLANG_ANALYSIS_CHECKERVISITOR
#define LLVM_CLANG_ANALYSIS_CHECKERVISITOR
-#include "clang/Checker/PathSensitive/Checker.h"
+#include "clang/GR/PathSensitive/Checker.h"
namespace clang {
@@ -49,7 +49,7 @@ public:
case Stmt::NAME ## Class:\
static_cast<ImplClass*>(this)->PreVisit ## NAME(C,static_cast<const NAME*>(S));\
break;
-#include "clang/Checker/PathSensitive/CheckerVisitor.def"
+#include "clang/GR/PathSensitive/CheckerVisitor.def"
}
}
@@ -68,7 +68,7 @@ case Stmt::NAME ## Class:\
static_cast<ImplClass*>(this)->\
PostVisit ## NAME(C,static_cast<const NAME*>(S));\
break;
-#include "clang/Checker/PathSensitive/CheckerVisitor.def"
+#include "clang/GR/PathSensitive/CheckerVisitor.def"
}
}
@@ -99,7 +99,7 @@ void PreVisit ## NAME(CheckerContext &C, const NAME* S) {\
void PostVisit ## NAME(CheckerContext &C, const NAME* S) {\
static_cast<ImplClass*>(this)->PostVisit ## FALLBACK(C, S);\
}
-#include "clang/Checker/PathSensitive/CheckerVisitor.def"
+#include "clang/GR/PathSensitive/CheckerVisitor.def"
};
} // end clang namespace
diff --git a/include/clang/Checker/PathSensitive/ConstraintManager.h b/include/clang/GR/PathSensitive/ConstraintManager.h
index fe37291279..c845a44645 100644
--- a/include/clang/Checker/PathSensitive/ConstraintManager.h
+++ b/include/clang/GR/PathSensitive/ConstraintManager.h
@@ -15,7 +15,7 @@
#define LLVM_CLANG_ANALYSIS_CONSTRAINT_MANAGER_H
// FIXME: Typedef LiveSymbolsTy/DeadSymbolsTy at a more appropriate place.
-#include "clang/Checker/PathSensitive/Store.h"
+#include "clang/GR/PathSensitive/Store.h"
namespace llvm {
class APSInt;
diff --git a/include/clang/Checker/PathSensitive/Environment.h b/include/clang/GR/PathSensitive/Environment.h
index a2b3567a4f..46996bae9a 100644
--- a/include/clang/Checker/PathSensitive/Environment.h
+++ b/include/clang/GR/PathSensitive/Environment.h
@@ -14,8 +14,8 @@
#ifndef LLVM_CLANG_ANALYSIS_ENVIRONMENT_H
#define LLVM_CLANG_ANALYSIS_ENVIRONMENT_H
-#include "clang/Checker/PathSensitive/Store.h"
-#include "clang/Checker/PathSensitive/SVals.h"
+#include "clang/GR/PathSensitive/Store.h"
+#include "clang/GR/PathSensitive/SVals.h"
#include "llvm/ADT/ImmutableMap.h"
namespace clang {
diff --git a/include/clang/Checker/PathSensitive/ExplodedGraph.h b/include/clang/GR/PathSensitive/ExplodedGraph.h
index c875a2308b..c875a2308b 100644
--- a/include/clang/Checker/PathSensitive/ExplodedGraph.h
+++ b/include/clang/GR/PathSensitive/ExplodedGraph.h
diff --git a/include/clang/Checker/PathSensitive/GRBlockCounter.h b/include/clang/GR/PathSensitive/GRBlockCounter.h
index b7d0e8ae0c..b7d0e8ae0c 100644
--- a/include/clang/Checker/PathSensitive/GRBlockCounter.h
+++ b/include/clang/GR/PathSensitive/GRBlockCounter.h
diff --git a/include/clang/Checker/PathSensitive/GRCoreEngine.h b/include/clang/GR/PathSensitive/GRCoreEngine.h
index d8349ba3ce..882c8256c3 100644
--- a/include/clang/Checker/PathSensitive/GRCoreEngine.h
+++ b/include/clang/GR/PathSensitive/GRCoreEngine.h
@@ -16,10 +16,10 @@
#define LLVM_CLANG_ANALYSIS_GRENGINE
#include "clang/AST/Expr.h"
-#include "clang/Checker/PathSensitive/ExplodedGraph.h"
-#include "clang/Checker/PathSensitive/GRWorkList.h"
-#include "clang/Checker/PathSensitive/GRBlockCounter.h"
-#include "clang/Checker/PathSensitive/GRSubEngine.h"
+#include "clang/GR/PathSensitive/ExplodedGraph.h"
+#include "clang/GR/PathSensitive/GRWorkList.h"
+#include "clang/GR/PathSensitive/GRBlockCounter.h"
+#include "clang/GR/PathSensitive/GRSubEngine.h"
#include "llvm/ADT/OwningPtr.h"
namespace clang {
diff --git a/include/clang/Checker/PathSensitive/GRExprEngine.h b/include/clang/GR/PathSensitive/GRExprEngine.h
index c18d3b1c7e..ee0ad8b51c 100644
--- a/include/clang/Checker/PathSensitive/GRExprEngine.h
+++ b/include/clang/GR/PathSensitive/GRExprEngine.h
@@ -16,12 +16,12 @@
#ifndef LLVM_CLANG_ANALYSIS_GREXPRENGINE
#define LLVM_CLANG_ANALYSIS_GREXPRENGINE
-#include "clang/Checker/PathSensitive/AnalysisManager.h"
-#include "clang/Checker/PathSensitive/GRSubEngine.h"
-#include "clang/Checker/PathSensitive/GRCoreEngine.h"
-#include "clang/Checker/PathSensitive/GRState.h"
-#include "clang/Checker/PathSensitive/GRTransferFuncs.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/GR/PathSensitive/AnalysisManager.h"
+#include "clang/GR/PathSensitive/GRSubEngine.h"
+#include "clang/GR/PathSensitive/GRCoreEngine.h"
+#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/GRTransferFuncs.h"
+#include "clang/GR/BugReporter/BugReporter.h"
#include "clang/AST/Type.h"
#include "clang/AST/ExprObjC.h"
#include "clang/AST/ExprCXX.h"
diff --git a/include/clang/Checker/PathSensitive/GRExprEngineBuilders.h b/include/clang/GR/PathSensitive/GRExprEngineBuilders.h
index 5503412f7e..052893ce9e 100644
--- a/include/clang/Checker/PathSensitive/GRExprEngineBuilders.h
+++ b/include/clang/GR/PathSensitive/GRExprEngineBuilders.h
@@ -14,7 +14,7 @@
#ifndef LLVM_CLANG_ANALYSIS_GREXPRENGINE_BUILDERS
#define LLVM_CLANG_ANALYSIS_GREXPRENGINE_BUILDERS
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
#include "clang/Analysis/Support/SaveAndRestore.h"
namespace clang {
diff --git a/include/clang/Checker/PathSensitive/GRState.h b/include/clang/GR/PathSensitive/GRState.h
index 47ea4c9d08..5212615511 100644
--- a/include/clang/Checker/PathSensitive/GRState.h
+++ b/include/clang/GR/PathSensitive/GRState.h
@@ -14,10 +14,10 @@
#ifndef LLVM_CLANG_ANALYSIS_VALUESTATE_H
#define LLVM_CLANG_ANALYSIS_VALUESTATE_H
-#include "clang/Checker/PathSensitive/ConstraintManager.h"
-#include "clang/Checker/PathSensitive/Environment.h"
-#include "clang/Checker/PathSensitive/Store.h"
-#include "clang/Checker/PathSensitive/SValBuilder.h"
+#include "clang/GR/PathSensitive/ConstraintManager.h"
+#include "clang/GR/PathSensitive/Environment.h"
+#include "clang/GR/PathSensitive/Store.h"
+#include "clang/GR/PathSensitive/SValBuilder.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/ImmutableMap.h"
#include "llvm/Support/Casting.h"
diff --git a/include/clang/Checker/PathSensitive/GRStateTrait.h b/include/clang/GR/PathSensitive/GRStateTrait.h
index 25be33f028..25be33f028 100644
--- a/include/clang/Checker/PathSensitive/GRStateTrait.h
+++ b/include/clang/GR/PathSensitive/GRStateTrait.h
diff --git a/include/clang/Checker/PathSensitive/GRSubEngine.h b/include/clang/GR/PathSensitive/GRSubEngine.h
index ff86adc9f8..bba44ab2e5 100644
--- a/include/clang/Checker/PathSensitive/GRSubEngine.h
+++ b/include/clang/GR/PathSensitive/GRSubEngine.h
@@ -13,7 +13,7 @@
#ifndef LLVM_CLANG_ANALYSIS_GRSUBENGINE_H
#define LLVM_CLANG_ANALYSIS_GRSUBENGINE_H
-#include "clang/Checker/PathSensitive/SVals.h"
+#include "clang/GR/PathSensitive/SVals.h"
namespace clang {
diff --git a/include/clang/Checker/PathSensitive/GRTransferFuncs.h b/include/clang/GR/PathSensitive/GRTransferFuncs.h
index a6a79cf91d..9e509dfcea 100644
--- a/include/clang/Checker/PathSensitive/GRTransferFuncs.h
+++ b/include/clang/GR/PathSensitive/GRTransferFuncs.h
@@ -15,8 +15,8 @@
#ifndef LLVM_CLANG_ANALYSIS_GRTF
#define LLVM_CLANG_ANALYSIS_GRTF
-#include "clang/Checker/PathSensitive/GRState.h"
-#include "clang/Checker/PathSensitive/SVals.h"
+#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/SVals.h"
#include <vector>
namespace clang {
diff --git a/include/clang/Checker/PathSensitive/GRWorkList.h b/include/clang/GR/PathSensitive/GRWorkList.h
index 6400dae2c1..062df94802 100644
--- a/include/clang/Checker/PathSensitive/GRWorkList.h
+++ b/include/clang/GR/PathSensitive/GRWorkList.h
@@ -15,7 +15,7 @@
#ifndef LLVM_CLANG_ANALYSIS_GRWORKLIST
#define LLVM_CLANG_ANALYSIS_GRWORKLIST
-#include "clang/Checker/PathSensitive/GRBlockCounter.h"
+#include "clang/GR/PathSensitive/GRBlockCounter.h"
#include <cstddef>
namespace clang {
diff --git a/include/clang/Checker/PathSensitive/MemRegion.h b/include/clang/GR/PathSensitive/MemRegion.h
index ac44944c50..348acbd171 100644
--- a/include/clang/Checker/PathSensitive/MemRegion.h
+++ b/include/clang/GR/PathSensitive/MemRegion.h
@@ -18,7 +18,7 @@
#include "clang/AST/Decl.h"
#include "clang/AST/DeclObjC.h"
-#include "clang/Checker/PathSensitive/SVals.h"
+#include "clang/GR/PathSensitive/SVals.h"
#include "llvm/Support/Casting.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/ADT/FoldingSet.h"
diff --git a/include/clang/Checker/PathSensitive/SValBuilder.h b/include/clang/GR/PathSensitive/SValBuilder.h
index b1776e0a87..1b5fac3db2 100644
--- a/include/clang/Checker/PathSensitive/SValBuilder.h
+++ b/include/clang/GR/PathSensitive/SValBuilder.h
@@ -17,9 +17,9 @@
#include "clang/AST/Expr.h"
#include "clang/AST/ExprCXX.h"
-#include "clang/Checker/PathSensitive/SVals.h"
-#include "clang/Checker/PathSensitive/BasicValueFactory.h"
-#include "clang/Checker/PathSensitive/MemRegion.h"
+#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/GR/PathSensitive/BasicValueFactory.h"
+#include "clang/GR/PathSensitive/MemRegion.h"
namespace clang {
diff --git a/include/clang/Checker/PathSensitive/SVals.h b/include/clang/GR/PathSensitive/SVals.h
index a50d296ea7..336093a3b9 100644
--- a/include/clang/Checker/PathSensitive/SVals.h
+++ b/include/clang/GR/PathSensitive/SVals.h
@@ -15,7 +15,7 @@
#ifndef LLVM_CLANG_ANALYSIS_RVALUE_H
#define LLVM_CLANG_ANALYSIS_RVALUE_H
-#include "clang/Checker/PathSensitive/SymbolManager.h"
+#include "clang/GR/PathSensitive/SymbolManager.h"
#include "llvm/Support/Casting.h"
#include "llvm/ADT/ImmutableList.h"
diff --git a/include/clang/Checker/PathSensitive/Store.h b/include/clang/GR/PathSensitive/Store.h
index 67b90b3e1e..08997997d6 100644
--- a/include/clang/Checker/PathSensitive/Store.h
+++ b/include/clang/GR/PathSensitive/Store.h
@@ -14,8 +14,8 @@
#ifndef LLVM_CLANG_ANALYSIS_STORE_H
#define LLVM_CLANG_ANALYSIS_STORE_H
-#include "clang/Checker/PathSensitive/MemRegion.h"
-#include "clang/Checker/PathSensitive/SValBuilder.h"
+#include "clang/GR/PathSensitive/MemRegion.h"
+#include "clang/GR/PathSensitive/SValBuilder.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/Optional.h"
diff --git a/include/clang/Checker/PathSensitive/SummaryManager.h b/include/clang/GR/PathSensitive/SummaryManager.h
index fd23189491..fd23189491 100644
--- a/include/clang/Checker/PathSensitive/SummaryManager.h
+++ b/include/clang/GR/PathSensitive/SummaryManager.h
diff --git a/include/clang/Checker/PathSensitive/SymbolManager.h b/include/clang/GR/PathSensitive/SymbolManager.h
index 948795b40f..948795b40f 100644
--- a/include/clang/Checker/PathSensitive/SymbolManager.h
+++ b/include/clang/GR/PathSensitive/SymbolManager.h