summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Checker/AdjustedReturnValueChecker.cpp6
-rw-r--r--clang/lib/Checker/AggExprVisitor.cpp2
-rw-r--r--clang/lib/Checker/AnalysisConsumer.cpp18
-rw-r--r--clang/lib/Checker/AnalysisManager.cpp2
-rw-r--r--clang/lib/Checker/AnalyzerStatsChecker.cpp6
-rw-r--r--clang/lib/Checker/ArrayBoundChecker.cpp6
-rw-r--r--clang/lib/Checker/AttrNonNullChecker.cpp4
-rw-r--r--clang/lib/Checker/BasicConstraintManager.cpp6
-rw-r--r--clang/lib/Checker/BasicObjCFoundationChecks.cpp16
-rw-r--r--clang/lib/Checker/BasicStore.cpp2
-rw-r--r--clang/lib/Checker/BasicValueFactory.cpp2
-rw-r--r--clang/lib/Checker/BugReporter.cpp8
-rw-r--r--clang/lib/Checker/BugReporterVisitors.cpp8
-rw-r--r--clang/lib/Checker/BuiltinFunctionChecker.cpp2
-rw-r--r--clang/lib/Checker/CFRefCount.cpp16
-rw-r--r--clang/lib/Checker/CStringChecker.cpp6
-rw-r--r--clang/lib/Checker/CallAndMessageChecker.cpp4
-rw-r--r--clang/lib/Checker/CastSizeChecker.cpp4
-rw-r--r--clang/lib/Checker/CastToStructChecker.cpp4
-rw-r--r--clang/lib/Checker/CheckDeadStores.cpp6
-rw-r--r--clang/lib/Checker/CheckObjCDealloc.cpp6
-rw-r--r--clang/lib/Checker/CheckObjCInstMethSignature.cpp6
-rw-r--r--clang/lib/Checker/CheckSecuritySyntaxOnly.cpp4
-rw-r--r--clang/lib/Checker/CheckSizeofPointer.cpp4
-rw-r--r--clang/lib/Checker/Checker.cpp2
-rw-r--r--clang/lib/Checker/CheckerHelpers.cpp2
-rw-r--r--clang/lib/Checker/ChrootChecker.cpp10
-rw-r--r--clang/lib/Checker/DereferenceChecker.cpp8
-rw-r--r--clang/lib/Checker/DivZeroChecker.cpp4
-rw-r--r--clang/lib/Checker/Environment.cpp2
-rw-r--r--clang/lib/Checker/ExplodedGraph.cpp4
-rw-r--r--clang/lib/Checker/FixedAddressChecker.cpp4
-rw-r--r--clang/lib/Checker/FlatStore.cpp2
-rw-r--r--clang/lib/Checker/FrontendActions.cpp4
-rw-r--r--clang/lib/Checker/GRBlockCounter.cpp2
-rw-r--r--clang/lib/Checker/GRCXXExprEngine.cpp4
-rw-r--r--clang/lib/Checker/GRCoreEngine.cpp6
-rw-r--r--clang/lib/Checker/GRExprEngine.cpp10
-rw-r--r--clang/lib/Checker/GRExprEngineExperimentalChecks.cpp2
-rw-r--r--clang/lib/Checker/GRState.cpp8
-rw-r--r--clang/lib/Checker/HTMLDiagnostics.cpp4
-rw-r--r--clang/lib/Checker/IdempotentOperationChecker.cpp12
-rw-r--r--clang/lib/Checker/LLVMConventionsChecker.cpp4
-rw-r--r--clang/lib/Checker/MacOSXAPIChecker.cpp6
-rw-r--r--clang/lib/Checker/MallocChecker.cpp10
-rw-r--r--clang/lib/Checker/ManagerRegistry.cpp2
-rw-r--r--clang/lib/Checker/MemRegion.cpp4
-rw-r--r--clang/lib/Checker/NSAutoreleasePoolChecker.cpp6
-rw-r--r--clang/lib/Checker/NSErrorChecker.cpp8
-rw-r--r--clang/lib/Checker/NoReturnFunctionChecker.cpp2
-rw-r--r--clang/lib/Checker/OSAtomicChecker.cpp2
-rw-r--r--clang/lib/Checker/ObjCAtSyncChecker.cpp8
-rw-r--r--clang/lib/Checker/ObjCUnusedIVarsChecker.cpp6
-rw-r--r--clang/lib/Checker/PathDiagnostic.cpp2
-rw-r--r--clang/lib/Checker/PlistDiagnostics.cpp4
-rw-r--r--clang/lib/Checker/PointerArithChecker.cpp4
-rw-r--r--clang/lib/Checker/PointerSubChecker.cpp4
-rw-r--r--clang/lib/Checker/PthreadLockChecker.cpp6
-rw-r--r--clang/lib/Checker/RangeConstraintManager.cpp8
-rw-r--r--clang/lib/Checker/RegionStore.cpp6
-rw-r--r--clang/lib/Checker/ReturnPointerRangeChecker.cpp6
-rw-r--r--clang/lib/Checker/ReturnUndefChecker.cpp6
-rw-r--r--clang/lib/Checker/SValBuilder.cpp10
-rw-r--r--clang/lib/Checker/SVals.cpp2
-rw-r--r--clang/lib/Checker/SimpleConstraintManager.cpp6
-rw-r--r--clang/lib/Checker/SimpleConstraintManager.h4
-rw-r--r--clang/lib/Checker/SimpleSValBuilder.cpp4
-rw-r--r--clang/lib/Checker/StackAddrLeakChecker.cpp6
-rw-r--r--clang/lib/Checker/Store.cpp4
-rw-r--r--clang/lib/Checker/StreamChecker.cpp10
-rw-r--r--clang/lib/Checker/SymbolManager.cpp4
-rw-r--r--clang/lib/Checker/TextPathDiagnostics.cpp4
-rw-r--r--clang/lib/Checker/UndefBranchChecker.cpp4
-rw-r--r--clang/lib/Checker/UndefCapturedBlockVarChecker.cpp6
-rw-r--r--clang/lib/Checker/UndefResultChecker.cpp6
-rw-r--r--clang/lib/Checker/UndefinedArraySubscriptChecker.cpp4
-rw-r--r--clang/lib/Checker/UndefinedAssignmentChecker.cpp4
-rw-r--r--clang/lib/Checker/UnixAPIChecker.cpp4
-rw-r--r--clang/lib/Checker/UnreachableCodeChecker.cpp10
-rw-r--r--clang/lib/Checker/VLASizeChecker.cpp6
-rw-r--r--clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp2
81 files changed, 221 insertions, 221 deletions
diff --git a/clang/lib/Checker/AdjustedReturnValueChecker.cpp b/clang/lib/Checker/AdjustedReturnValueChecker.cpp
index 0f7e59c0f56..281d74f926c 100644
--- a/clang/lib/Checker/AdjustedReturnValueChecker.cpp
+++ b/clang/lib/Checker/AdjustedReturnValueChecker.cpp
@@ -14,9 +14,9 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
using namespace clang;
diff --git a/clang/lib/Checker/AggExprVisitor.cpp b/clang/lib/Checker/AggExprVisitor.cpp
index f31bcec73ad..b8ec92ff810 100644
--- a/clang/lib/Checker/AggExprVisitor.cpp
+++ b/clang/lib/Checker/AggExprVisitor.cpp
@@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
#include "clang/AST/StmtVisitor.h"
using namespace clang;
diff --git a/clang/lib/Checker/AnalysisConsumer.cpp b/clang/lib/Checker/AnalysisConsumer.cpp
index 52066f14aa9..839ce044fd4 100644
--- a/clang/lib/Checker/AnalysisConsumer.cpp
+++ b/clang/lib/Checker/AnalysisConsumer.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/AnalysisConsumer.h"
+#include "clang/GR/AnalysisConsumer.h"
#include "clang/AST/ASTConsumer.h"
#include "clang/AST/Decl.h"
#include "clang/AST/DeclCXX.h"
@@ -20,14 +20,14 @@
#include "clang/Analysis/Analyses/LiveVariables.h"
#include "clang/Analysis/Analyses/UninitializedValues.h"
#include "clang/Analysis/CFG.h"
-#include "clang/Checker/Checkers/LocalCheckers.h"
-#include "clang/Checker/ManagerRegistry.h"
-#include "clang/Checker/BugReporter/PathDiagnostic.h"
-#include "clang/Checker/PathSensitive/AnalysisManager.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/PathSensitive/GRTransferFuncs.h"
-#include "clang/Checker/PathDiagnosticClients.h"
+#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/GR/ManagerRegistry.h"
+#include "clang/GR/BugReporter/PathDiagnostic.h"
+#include "clang/GR/PathSensitive/AnalysisManager.h"
+#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
+#include "clang/GR/PathSensitive/GRTransferFuncs.h"
+#include "clang/GR/PathDiagnosticClients.h"
#include "GRExprEngineExperimentalChecks.h"
#include "GRExprEngineInternalChecks.h"
#include "clang/Basic/FileManager.h"
diff --git a/clang/lib/Checker/AnalysisManager.cpp b/clang/lib/Checker/AnalysisManager.cpp
index 1bc22a320be..736cf1d7b18 100644
--- a/clang/lib/Checker/AnalysisManager.cpp
+++ b/clang/lib/Checker/AnalysisManager.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/AnalysisManager.h"
+#include "clang/GR/PathSensitive/AnalysisManager.h"
#include "clang/Index/Entity.h"
#include "clang/Index/Indexer.h"
diff --git a/clang/lib/Checker/AnalyzerStatsChecker.cpp b/clang/lib/Checker/AnalyzerStatsChecker.cpp
index c484537e957..2a229cc7e9c 100644
--- a/clang/lib/Checker/AnalyzerStatsChecker.cpp
+++ b/clang/lib/Checker/AnalyzerStatsChecker.cpp
@@ -9,9 +9,9 @@
// This file reports various statistics about analyzer visitation.
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/ExplodedGraph.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/ExplodedGraph.h"
+#include "clang/GR/BugReporter/BugReporter.h"
#include "GRExprEngineExperimentalChecks.h"
#include "clang/Basic/SourceManager.h"
#include "llvm/ADT/SmallPtrSet.h"
diff --git a/clang/lib/Checker/ArrayBoundChecker.cpp b/clang/lib/Checker/ArrayBoundChecker.cpp
index df21595a413..a36e13e4fe6 100644
--- a/clang/lib/Checker/ArrayBoundChecker.cpp
+++ b/clang/lib/Checker/ArrayBoundChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
using namespace clang;
diff --git a/clang/lib/Checker/AttrNonNullChecker.cpp b/clang/lib/Checker/AttrNonNullChecker.cpp
index 85d7fda6d13..5be12783bd8 100644
--- a/clang/lib/Checker/AttrNonNullChecker.cpp
+++ b/clang/lib/Checker/AttrNonNullChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
using namespace clang;
diff --git a/clang/lib/Checker/BasicConstraintManager.cpp b/clang/lib/Checker/BasicConstraintManager.cpp
index 862b59babdd..01669681515 100644
--- a/clang/lib/Checker/BasicConstraintManager.cpp
+++ b/clang/lib/Checker/BasicConstraintManager.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "SimpleConstraintManager.h"
-#include "clang/Checker/PathSensitive/GRState.h"
-#include "clang/Checker/PathSensitive/GRStateTrait.h"
-#include "clang/Checker/PathSensitive/GRTransferFuncs.h"
+#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/GRStateTrait.h"
+#include "clang/GR/PathSensitive/GRTransferFuncs.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/clang/lib/Checker/BasicObjCFoundationChecks.cpp b/clang/lib/Checker/BasicObjCFoundationChecks.cpp
index 8009bf1d65c..dc536957047 100644
--- a/clang/lib/Checker/BasicObjCFoundationChecks.cpp
+++ b/clang/lib/Checker/BasicObjCFoundationChecks.cpp
@@ -15,14 +15,14 @@
#include "BasicObjCFoundationChecks.h"
-#include "clang/Checker/PathSensitive/ExplodedGraph.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/PathSensitive/GRState.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/MemRegion.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/Checkers/LocalCheckers.h"
+#include "clang/GR/PathSensitive/ExplodedGraph.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
+#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/MemRegion.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/Checkers/LocalCheckers.h"
#include "clang/AST/DeclObjC.h"
#include "clang/AST/Expr.h"
#include "clang/AST/ExprObjC.h"
diff --git a/clang/lib/Checker/BasicStore.cpp b/clang/lib/Checker/BasicStore.cpp
index bf6eedc5788..e9e85b9bd17 100644
--- a/clang/lib/Checker/BasicStore.cpp
+++ b/clang/lib/Checker/BasicStore.cpp
@@ -15,7 +15,7 @@
#include "clang/AST/ExprObjC.h"
#include "clang/Analysis/Analyses/LiveVariables.h"
#include "clang/Analysis/AnalysisContext.h"
-#include "clang/Checker/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/GRState.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
diff --git a/clang/lib/Checker/BasicValueFactory.cpp b/clang/lib/Checker/BasicValueFactory.cpp
index c6b71a9b0d2..93528167054 100644
--- a/clang/lib/Checker/BasicValueFactory.cpp
+++ b/clang/lib/Checker/BasicValueFactory.cpp
@@ -13,7 +13,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/BasicValueFactory.h"
+#include "clang/GR/PathSensitive/BasicValueFactory.h"
using namespace clang;
diff --git a/clang/lib/Checker/BugReporter.cpp b/clang/lib/Checker/BugReporter.cpp
index 2dcdb6177fc..41381d7bb46 100644
--- a/clang/lib/Checker/BugReporter.cpp
+++ b/clang/lib/Checker/BugReporter.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
+#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
#include "clang/AST/ASTContext.h"
#include "clang/Analysis/CFG.h"
#include "clang/AST/Expr.h"
@@ -22,7 +22,7 @@
#include "clang/AST/StmtObjC.h"
#include "clang/Basic/SourceManager.h"
#include "clang/Analysis/ProgramPoint.h"
-#include "clang/Checker/BugReporter/PathDiagnostic.h"
+#include "clang/GR/BugReporter/PathDiagnostic.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/STLExtras.h"
diff --git a/clang/lib/Checker/BugReporterVisitors.cpp b/clang/lib/Checker/BugReporterVisitors.cpp
index 20e1296997f..66410064809 100644
--- a/clang/lib/Checker/BugReporterVisitors.cpp
+++ b/clang/lib/Checker/BugReporterVisitors.cpp
@@ -14,10 +14,10 @@
#include "clang/AST/Expr.h"
#include "clang/AST/ExprObjC.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/Checker/BugReporter/PathDiagnostic.h"
-#include "clang/Checker/PathSensitive/ExplodedGraph.h"
-#include "clang/Checker/PathSensitive/GRState.h"
+#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/GR/BugReporter/PathDiagnostic.h"
+#include "clang/GR/PathSensitive/ExplodedGraph.h"
+#include "clang/GR/PathSensitive/GRState.h"
using namespace clang;
diff --git a/clang/lib/Checker/BuiltinFunctionChecker.cpp b/clang/lib/Checker/BuiltinFunctionChecker.cpp
index 757f158e232..08fcbd6f4ef 100644
--- a/clang/lib/Checker/BuiltinFunctionChecker.cpp
+++ b/clang/lib/Checker/BuiltinFunctionChecker.cpp
@@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/PathSensitive/Checker.h"
+#include "clang/GR/PathSensitive/Checker.h"
#include "clang/Basic/Builtins.h"
using namespace clang;
diff --git a/clang/lib/Checker/CFRefCount.cpp b/clang/lib/Checker/CFRefCount.cpp
index e50081d84cc..211c2659614 100644
--- a/clang/lib/Checker/CFRefCount.cpp
+++ b/clang/lib/Checker/CFRefCount.cpp
@@ -16,15 +16,15 @@
#include "clang/AST/StmtVisitor.h"
#include "clang/Basic/LangOptions.h"
#include "clang/Basic/SourceManager.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/BugReporter/PathDiagnostic.h"
-#include "clang/Checker/Checkers/LocalCheckers.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/BugReporter/PathDiagnostic.h"
+#include "clang/GR/Checkers/LocalCheckers.h"
#include "clang/Analysis/DomainSpecific/CocoaConventions.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRExprEngineBuilders.h"
-#include "clang/Checker/PathSensitive/GRStateTrait.h"
-#include "clang/Checker/PathSensitive/GRTransferFuncs.h"
-#include "clang/Checker/PathSensitive/SymbolManager.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRExprEngineBuilders.h"
+#include "clang/GR/PathSensitive/GRStateTrait.h"
+#include "clang/GR/PathSensitive/GRTransferFuncs.h"
+#include "clang/GR/PathSensitive/SymbolManager.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/ImmutableList.h"
diff --git a/clang/lib/Checker/CStringChecker.cpp b/clang/lib/Checker/CStringChecker.cpp
index f3dd8033af8..db4d86f0e3b 100644
--- a/clang/lib/Checker/CStringChecker.cpp
+++ b/clang/lib/Checker/CStringChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineExperimentalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRStateTrait.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRStateTrait.h"
#include "llvm/ADT/StringSwitch.h"
using namespace clang;
diff --git a/clang/lib/Checker/CallAndMessageChecker.cpp b/clang/lib/Checker/CallAndMessageChecker.cpp
index 8bf1786c56b..e68569ce7e8 100644
--- a/clang/lib/Checker/CallAndMessageChecker.cpp
+++ b/clang/lib/Checker/CallAndMessageChecker.cpp
@@ -15,8 +15,8 @@
#include "GRExprEngineInternalChecks.h"
#include "clang/AST/ParentMap.h"
#include "clang/Basic/TargetInfo.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
using namespace clang;
diff --git a/clang/lib/Checker/CastSizeChecker.cpp b/clang/lib/Checker/CastSizeChecker.cpp
index e62a8ce4560..1248d12c911 100644
--- a/clang/lib/Checker/CastSizeChecker.cpp
+++ b/clang/lib/Checker/CastSizeChecker.cpp
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
#include "clang/AST/CharUnits.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
#include "GRExprEngineInternalChecks.h"
using namespace clang;
diff --git a/clang/lib/Checker/CastToStructChecker.cpp b/clang/lib/Checker/CastToStructChecker.cpp
index f85782d81e4..2a010b210b0 100644
--- a/clang/lib/Checker/CastToStructChecker.cpp
+++ b/clang/lib/Checker/CastToStructChecker.cpp
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
#include "GRExprEngineInternalChecks.h"
using namespace clang;
diff --git a/clang/lib/Checker/CheckDeadStores.cpp b/clang/lib/Checker/CheckDeadStores.cpp
index 63b2f563ca1..7e90781bd30 100644
--- a/clang/lib/Checker/CheckDeadStores.cpp
+++ b/clang/lib/Checker/CheckDeadStores.cpp
@@ -12,11 +12,11 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/Checkers/LocalCheckers.h"
+#include "clang/GR/Checkers/LocalCheckers.h"
#include "clang/Analysis/Analyses/LiveVariables.h"
#include "clang/Analysis/Visitors/CFGRecStmtVisitor.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
+#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
#include "clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h"
#include "clang/Basic/Diagnostic.h"
#include "clang/AST/ASTContext.h"
diff --git a/clang/lib/Checker/CheckObjCDealloc.cpp b/clang/lib/Checker/CheckObjCDealloc.cpp
index 8ee6daa5c8a..c3d511ba025 100644
--- a/clang/lib/Checker/CheckObjCDealloc.cpp
+++ b/clang/lib/Checker/CheckObjCDealloc.cpp
@@ -13,9 +13,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/Checkers/LocalCheckers.h"
-#include "clang/Checker/BugReporter/PathDiagnostic.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/GR/BugReporter/PathDiagnostic.h"
+#include "clang/GR/BugReporter/BugReporter.h"
#include "clang/AST/ExprObjC.h"
#include "clang/AST/Expr.h"
#include "clang/AST/DeclObjC.h"
diff --git a/clang/lib/Checker/CheckObjCInstMethSignature.cpp b/clang/lib/Checker/CheckObjCInstMethSignature.cpp
index 76a092393bb..2b83d13e759 100644
--- a/clang/lib/Checker/CheckObjCInstMethSignature.cpp
+++ b/clang/lib/Checker/CheckObjCInstMethSignature.cpp
@@ -13,9 +13,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/Checkers/LocalCheckers.h"
-#include "clang/Checker/BugReporter/PathDiagnostic.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/GR/BugReporter/PathDiagnostic.h"
+#include "clang/GR/BugReporter/BugReporter.h"
#include "clang/AST/DeclObjC.h"
#include "clang/AST/Type.h"
#include "clang/AST/ASTContext.h"
diff --git a/clang/lib/Checker/CheckSecuritySyntaxOnly.cpp b/clang/lib/Checker/CheckSecuritySyntaxOnly.cpp
index 6090fa5baf2..bdf18ca7608 100644
--- a/clang/lib/Checker/CheckSecuritySyntaxOnly.cpp
+++ b/clang/lib/Checker/CheckSecuritySyntaxOnly.cpp
@@ -12,8 +12,8 @@
//===----------------------------------------------------------------------===//
#include "clang/Basic/TargetInfo.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/Checker/Checkers/LocalCheckers.h"
+#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/GR/Checkers/LocalCheckers.h"
#include "clang/AST/StmtVisitor.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/clang/lib/Checker/CheckSizeofPointer.cpp b/clang/lib/Checker/CheckSizeofPointer.cpp
index bbe494c99da..4cf5eb70069 100644
--- a/clang/lib/Checker/CheckSizeofPointer.cpp
+++ b/clang/lib/Checker/CheckSizeofPointer.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/GR/BugReporter/BugReporter.h"
#include "clang/AST/StmtVisitor.h"
-#include "clang/Checker/Checkers/LocalCheckers.h"
+#include "clang/GR/Checkers/LocalCheckers.h"
using namespace clang;
diff --git a/clang/lib/Checker/Checker.cpp b/clang/lib/Checker/Checker.cpp
index 36323b9efb6..00976dbcedd 100644
--- a/clang/lib/Checker/Checker.cpp
+++ b/clang/lib/Checker/Checker.cpp
@@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/Checker.h"
+#include "clang/GR/PathSensitive/Checker.h"
using namespace clang;
Checker::~Checker() {}
diff --git a/clang/lib/Checker/CheckerHelpers.cpp b/clang/lib/Checker/CheckerHelpers.cpp
index ece69435cac..3819ed30ab2 100644
--- a/clang/lib/Checker/CheckerHelpers.cpp
+++ b/clang/lib/Checker/CheckerHelpers.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/CheckerHelpers.h"
+#include "clang/GR/PathSensitive/CheckerHelpers.h"
#include "clang/AST/Expr.h"
// Recursively find any substatements containing macros
diff --git a/clang/lib/Checker/ChrootChecker.cpp b/clang/lib/Checker/ChrootChecker.cpp
index f28ebadb08b..2108094ae11 100644
--- a/clang/lib/Checker/ChrootChecker.cpp
+++ b/clang/lib/Checker/ChrootChecker.cpp
@@ -12,11 +12,11 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineExperimentalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRState.h"
-#include "clang/Checker/PathSensitive/GRStateTrait.h"
-#include "clang/Checker/PathSensitive/SymbolManager.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/GRStateTrait.h"
+#include "clang/GR/PathSensitive/SymbolManager.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
diff --git a/clang/lib/Checker/DereferenceChecker.cpp b/clang/lib/Checker/DereferenceChecker.cpp
index 5938ca18246..72c88b1a3c7 100644
--- a/clang/lib/Checker/DereferenceChecker.cpp
+++ b/clang/lib/Checker/DereferenceChecker.cpp
@@ -13,10 +13,10 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/Checkers/DereferenceChecker.h"
-#include "clang/Checker/PathSensitive/Checker.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/Checkers/DereferenceChecker.h"
+#include "clang/GR/PathSensitive/Checker.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
using namespace clang;
diff --git a/clang/lib/Checker/DivZeroChecker.cpp b/clang/lib/Checker/DivZeroChecker.cpp
index 7df902a99b5..e76d84672f7 100644
--- a/clang/lib/Checker/DivZeroChecker.cpp
+++ b/clang/lib/Checker/DivZeroChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
using namespace clang;
diff --git a/clang/lib/Checker/Environment.cpp b/clang/lib/Checker/Environment.cpp
index 7bf2929161c..5846d6aceed 100644
--- a/clang/lib/Checker/Environment.cpp
+++ b/clang/lib/Checker/Environment.cpp
@@ -13,7 +13,7 @@
#include "clang/Analysis/AnalysisContext.h"
#include "clang/Analysis/CFG.h"
-#include "clang/Checker/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/GRState.h"
using namespace clang;
diff --git a/clang/lib/Checker/ExplodedGraph.cpp b/clang/lib/Checker/ExplodedGraph.cpp
index 20429b95199..6890ebf2fc7 100644
--- a/clang/lib/Checker/ExplodedGraph.cpp
+++ b/clang/lib/Checker/ExplodedGraph.cpp
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/ExplodedGraph.h"
-#include "clang/Checker/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/ExplodedGraph.h"
+#include "clang/GR/PathSensitive/GRState.h"
#include "clang/AST/Stmt.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/DenseMap.h"
diff --git a/clang/lib/Checker/FixedAddressChecker.cpp b/clang/lib/Checker/FixedAddressChecker.cpp
index 2237768beba..ede6b555d48 100644
--- a/clang/lib/Checker/FixedAddressChecker.cpp
+++ b/clang/lib/Checker/FixedAddressChecker.cpp
@@ -14,8 +14,8 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
using namespace clang;
diff --git a/clang/lib/Checker/FlatStore.cpp b/clang/lib/Checker/FlatStore.cpp
index 6053f33ad55..6e70f61be61 100644
--- a/clang/lib/Checker/FlatStore.cpp
+++ b/clang/lib/Checker/FlatStore.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/GRState.h"
#include "llvm/ADT/ImmutableIntervalMap.h"
#include "llvm/Support/ErrorHandling.h"
diff --git a/clang/lib/Checker/FrontendActions.cpp b/clang/lib/Checker/FrontendActions.cpp
index d9a54a021bc..e3ef60b512e 100644
--- a/clang/lib/Checker/FrontendActions.cpp
+++ b/clang/lib/Checker/FrontendActions.cpp
@@ -7,9 +7,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/FrontendActions.h"
+#include "clang/GR/FrontendActions.h"
#include "clang/Frontend/CompilerInstance.h"
-#include "clang/Checker/AnalysisConsumer.h"
+#include "clang/GR/AnalysisConsumer.h"
using namespace clang;
ASTConsumer *AnalysisAction::CreateASTConsumer(CompilerInstance &CI,
diff --git a/clang/lib/Checker/GRBlockCounter.cpp b/clang/lib/Checker/GRBlockCounter.cpp
index 75fb16a2d5f..6a1991750df 100644
--- a/clang/lib/Checker/GRBlockCounter.cpp
+++ b/clang/lib/Checker/GRBlockCounter.cpp
@@ -13,7 +13,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/GRBlockCounter.h"
+#include "clang/GR/PathSensitive/GRBlockCounter.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
diff --git a/clang/lib/Checker/GRCXXExprEngine.cpp b/clang/lib/Checker/GRCXXExprEngine.cpp
index 0e2ac04efbf..73b8b271ae0 100644
--- a/clang/lib/Checker/GRCXXExprEngine.cpp
+++ b/clang/lib/Checker/GRCXXExprEngine.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/AnalysisManager.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
+#include "clang/GR/PathSensitive/AnalysisManager.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
#include "clang/AST/DeclCXX.h"
using namespace clang;
diff --git a/clang/lib/Checker/GRCoreEngine.cpp b/clang/lib/Checker/GRCoreEngine.cpp
index 1274f25880e..9f34e89d9ec 100644
--- a/clang/lib/Checker/GRCoreEngine.cpp
+++ b/clang/lib/Checker/GRCoreEngine.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/AnalysisManager.h"
-#include "clang/Checker/PathSensitive/GRCoreEngine.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
+#include "clang/GR/PathSensitive/AnalysisManager.h"
+#include "clang/GR/PathSensitive/GRCoreEngine.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
#include "clang/Index/TranslationUnit.h"
#include "clang/AST/Expr.h"
#include "llvm/Support/Casting.h"
diff --git a/clang/lib/Checker/GRExprEngine.cpp b/clang/lib/Checker/GRExprEngine.cpp
index 41a89e7b39d..da325929902 100644
--- a/clang/lib/Checker/GRExprEngine.cpp
+++ b/clang/lib/Checker/GRExprEngine.cpp
@@ -13,11 +13,11 @@
//
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/AnalysisManager.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/PathSensitive/GRExprEngineBuilders.h"
-#include "clang/Checker/PathSensitive/Checker.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/AnalysisManager.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
+#include "clang/GR/PathSensitive/GRExprEngineBuilders.h"
+#include "clang/GR/PathSensitive/Checker.h"
#include "clang/AST/CharUnits.h"
#include "clang/AST/ParentMap.h"
#include "clang/AST/StmtObjC.h"
diff --git a/clang/lib/Checker/GRExprEngineExperimentalChecks.cpp b/clang/lib/Checker/GRExprEngineExperimentalChecks.cpp
index 6f70286e9be..f1acc65d769 100644
--- a/clang/lib/Checker/GRExprEngineExperimentalChecks.cpp
+++ b/clang/lib/Checker/GRExprEngineExperimentalChecks.cpp
@@ -14,7 +14,7 @@
#include "GRExprEngineInternalChecks.h"
#include "GRExprEngineExperimentalChecks.h"
-#include "clang/Checker/Checkers/LocalCheckers.h"
+#include "clang/GR/Checkers/LocalCheckers.h"
using namespace clang;
diff --git a/clang/lib/Checker/GRState.cpp b/clang/lib/Checker/GRState.cpp
index 3282664cdab..164cd8c9669 100644
--- a/clang/lib/Checker/GRState.cpp
+++ b/clang/lib/Checker/GRState.cpp
@@ -12,10 +12,10 @@
//===----------------------------------------------------------------------===//
#include "clang/Analysis/CFG.h"
-#include "clang/Checker/PathSensitive/GRStateTrait.h"
-#include "clang/Checker/PathSensitive/GRState.h"
-#include "clang/Checker/PathSensitive/GRSubEngine.h"
-#include "clang/Checker/PathSensitive/GRTransferFuncs.h"
+#include "clang/GR/PathSensitive/GRStateTrait.h"
+#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/GRSubEngine.h"
+#include "clang/GR/PathSensitive/GRTransferFuncs.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/clang/lib/Checker/HTMLDiagnostics.cpp b/clang/lib/Checker/HTMLDiagnostics.cpp
index 7fcb0256ddf..0db63c70e2b 100644
--- a/clang/lib/Checker/HTMLDiagnostics.cpp
+++ b/clang/lib/Checker/HTMLDiagnostics.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathDiagnosticClients.h"
-#include "clang/Checker/BugReporter/PathDiagnostic.h"
+#include "clang/GR/PathDiagnosticClients.h"
+#include "clang/GR/BugReporter/PathDiagnostic.h"
#include "clang/AST/ASTContext.h"
#include "clang/AST/Decl.h"
#include "clang/Basic/SourceManager.h"
diff --git a/clang/lib/Checker/IdempotentOperationChecker.cpp b/clang/lib/Checker/IdempotentOperationChecker.cpp
index fbf25ba4a81..e6f0e5de06f 100644
--- a/clang/lib/Checker/IdempotentOperationChecker.cpp
+++ b/clang/lib/Checker/IdempotentOperationChecker.cpp
@@ -45,12 +45,12 @@
#include "GRExprEngineExperimentalChecks.h"
#include "clang/Analysis/CFGStmtMap.h"
#include "clang/Analysis/Analyses/PseudoConstantAnalysis.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerHelpers.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRCoreEngine.h"
-#include "clang/Checker/PathSensitive/SVals.h"
+#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerHelpers.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRCoreEngine.h"
+#include "clang/GR/PathSensitive/SVals.h"
#include "clang/AST/Stmt.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallSet.h"
diff --git a/clang/lib/Checker/LLVMConventionsChecker.cpp b/clang/lib/Checker/LLVMConventionsChecker.cpp
index efc1d9820a8..e97074e5425 100644
--- a/clang/lib/Checker/LLVMConventionsChecker.cpp
+++ b/clang/lib/Checker/LLVMConventionsChecker.cpp
@@ -14,8 +14,8 @@
#include "clang/AST/DeclTemplate.h"
#include "clang/AST/StmtVisitor.h"
-#include "clang/Checker/Checkers/LocalCheckers.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/GR/BugReporter/BugReporter.h"
#include <string>
#include "llvm/ADT/StringRef.h"
diff --git a/clang/lib/Checker/MacOSXAPIChecker.cpp b/clang/lib/Checker/MacOSXAPIChecker.cpp
index edd1d4e2fe2..c798cb291f4 100644
--- a/clang/lib/Checker/MacOSXAPIChecker.cpp
+++ b/clang/lib/Checker/MacOSXAPIChecker.cpp
@@ -17,9 +17,9 @@
#include "GRExprEngineInternalChecks.h"
#include "clang/Basic/TargetInfo.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRStateTrait.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRStateTrait.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/clang/lib/Checker/MallocChecker.cpp b/clang/lib/Checker/MallocChecker.cpp
index 3cc3670645e..367ac245c14 100644
--- a/clang/lib/Checker/MallocChecker.cpp
+++ b/clang/lib/Checker/MallocChecker.cpp
@@ -13,11 +13,11 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineExperimentalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRState.h"
-#include "clang/Checker/PathSensitive/GRStateTrait.h"
-#include "clang/Checker/PathSensitive/SymbolManager.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/GRStateTrait.h"
+#include "clang/GR/PathSensitive/SymbolManager.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
diff --git a/clang/lib/Checker/ManagerRegistry.cpp b/clang/lib/Checker/ManagerRegistry.cpp
index d11a997cc0f..b1920e1aab5 100644
--- a/clang/lib/Checker/ManagerRegistry.cpp
+++ b/clang/lib/Checker/ManagerRegistry.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/ManagerRegistry.h"
+#include "clang/GR/ManagerRegistry.h"
using namespace clang;
diff --git a/clang/lib/Checker/MemRegion.cpp b/clang/lib/Checker/MemRegion.cpp
index b08a53ffe73..a1dee535f28 100644
--- a/clang/lib/Checker/MemRegion.cpp
+++ b/clang/lib/Checker/MemRegion.cpp
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#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 "clang/Analysis/AnalysisContext.h"
#include "clang/Analysis/Support/BumpVector.h"
#include "clang/AST/CharUnits.h"
diff --git a/clang/lib/Checker/NSAutoreleasePoolChecker.cpp b/clang/lib/Checker/NSAutoreleasePoolChecker.cpp
index 48f03a369ed..d8225a7e4e7 100644
--- a/clang/lib/Checker/NSAutoreleasePoolChecker.cpp
+++ b/clang/lib/Checker/NSAutoreleasePoolChecker.cpp
@@ -15,9 +15,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
#include "BasicObjCFoundationChecks.h"
#include "clang/AST/DeclObjC.h"
#include "clang/AST/Decl.h"
diff --git a/clang/lib/Checker/NSErrorChecker.cpp b/clang/lib/Checker/NSErrorChecker.cpp
index e30d54ccd79..73caf774bfc 100644
--- a/clang/lib/Checker/NSErrorChecker.cpp
+++ b/clang/lib/Checker/NSErrorChecker.cpp
@@ -15,10 +15,10 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/Checkers/LocalCheckers.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/Checkers/DereferenceChecker.h"
+#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
+#include "clang/GR/Checkers/DereferenceChecker.h"
#include "BasicObjCFoundationChecks.h"
#include "clang/AST/DeclObjC.h"
#include "clang/AST/Decl.h"
diff --git a/clang/lib/Checker/NoReturnFunctionChecker.cpp b/clang/lib/Checker/NoReturnFunctionChecker.cpp
index a8ea44aec6f..fdd2849719f 100644
--- a/clang/lib/Checker/NoReturnFunctionChecker.cpp
+++ b/clang/lib/Checker/NoReturnFunctionChecker.cpp
@@ -13,7 +13,7 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
#include "llvm/ADT/StringSwitch.h"
using namespace clang;
diff --git a/clang/lib/Checker/OSAtomicChecker.cpp b/clang/lib/Checker/OSAtomicChecker.cpp
index 6c1bffac2da..36b5335d88a 100644
--- a/clang/lib/Checker/OSAtomicChecker.cpp
+++ b/clang/lib/Checker/OSAtomicChecker.cpp
@@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/PathSensitive/Checker.h"
+#include "clang/GR/PathSensitive/Checker.h"
#include "clang/Basic/Builtins.h"
using namespace clang;
diff --git a/clang/lib/Checker/ObjCAtSyncChecker.cpp b/clang/lib/Checker/ObjCAtSyncChecker.cpp
index f26762895dd..c95df4ef4b9 100644
--- a/clang/lib/Checker/ObjCAtSyncChecker.cpp
+++ b/clang/lib/Checker/ObjCAtSyncChecker.cpp
@@ -13,10 +13,10 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/Checkers/DereferenceChecker.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/Checkers/DereferenceChecker.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
using namespace clang;
diff --git a/clang/lib/Checker/ObjCUnusedIVarsChecker.cpp b/clang/lib/Checker/ObjCUnusedIVarsChecker.cpp
index edeba74ae83..e3f5d565e72 100644
--- a/clang/lib/Checker/ObjCUnusedIVarsChecker.cpp
+++ b/clang/lib/Checker/ObjCUnusedIVarsChecker.cpp
@@ -13,9 +13,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/Checkers/LocalCheckers.h"
-#include "clang/Checker/BugReporter/PathDiagnostic.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/GR/BugReporter/PathDiagnostic.h"
+#include "clang/GR/BugReporter/BugReporter.h"
#include "clang/AST/ExprObjC.h"
#include "clang/AST/Expr.h"
#include "clang/AST/DeclObjC.h"
diff --git a/clang/lib/Checker/PathDiagnostic.cpp b/clang/lib/Checker/PathDiagnostic.cpp
index 0f0dddc6d78..17106434236 100644
--- a/clang/lib/Checker/PathDiagnostic.cpp
+++ b/clang/lib/Checker/PathDiagnostic.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/BugReporter/PathDiagnostic.h"
+#include "clang/GR/BugReporter/PathDiagnostic.h"
#include "clang/AST/Expr.h"
#include "clang/AST/Decl.h"
#include "clang/AST/DeclObjC.h"
diff --git a/clang/lib/Checker/PlistDiagnostics.cpp b/clang/lib/Checker/PlistDiagnostics.cpp
index 3b3152f30d9..5b91f6e78ec 100644
--- a/clang/lib/Checker/PlistDiagnostics.cpp
+++ b/clang/lib/Checker/PlistDiagnostics.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathDiagnosticClients.h"
-#include "clang/Checker/BugReporter/PathDiagnostic.h"
+#include "clang/GR/PathDiagnosticClients.h"
+#include "clang/GR/BugReporter/PathDiagnostic.h"
#include "clang/Basic/SourceManager.h"
#include "clang/Basic/FileManager.h"
#include "clang/Lex/Preprocessor.h"
diff --git a/clang/lib/Checker/PointerArithChecker.cpp b/clang/lib/Checker/PointerArithChecker.cpp
index 29f90caf342..0517140da32 100644
--- a/clang/lib/Checker/PointerArithChecker.cpp
+++ b/clang/lib/Checker/PointerArithChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
using namespace clang;
diff --git a/clang/lib/Checker/PointerSubChecker.cpp b/clang/lib/Checker/PointerSubChecker.cpp
index e86710a0c55..24f839dca12 100644
--- a/clang/lib/Checker/PointerSubChecker.cpp
+++ b/clang/lib/Checker/PointerSubChecker.cpp
@@ -14,8 +14,8 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
using namespace clang;
diff --git a/clang/lib/Checker/PthreadLockChecker.cpp b/clang/lib/Checker/PthreadLockChecker.cpp
index ba445e0470d..32f2f57b456 100644
--- a/clang/lib/Checker/PthreadLockChecker.cpp
+++ b/clang/lib/Checker/PthreadLockChecker.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
-#include "clang/Checker/PathSensitive/GRStateTrait.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/GR/PathSensitive/GRStateTrait.h"
#include "GRExprEngineExperimentalChecks.h"
#include "llvm/ADT/ImmutableSet.h"
diff --git a/clang/lib/Checker/RangeConstraintManager.cpp b/clang/lib/Checker/RangeConstraintManager.cpp
index e625ee2b903..423777e28d2 100644
--- a/clang/lib/Checker/RangeConstraintManager.cpp
+++ b/clang/lib/Checker/RangeConstraintManager.cpp
@@ -13,10 +13,10 @@
//===----------------------------------------------------------------------===//
#include "SimpleConstraintManager.h"
-#include "clang/Checker/PathSensitive/GRState.h"
-#include "clang/Checker/PathSensitive/GRStateTrait.h"
-#include "clang/Checker/PathSensitive/GRTransferFuncs.h"
-#include "clang/Checker/ManagerRegistry.h"
+#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/GRStateTrait.h"
+#include "clang/GR/PathSensitive/GRTransferFuncs.h"
+#include "clang/GR/ManagerRegistry.h"
#include "llvm/Support/Debug.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/ImmutableSet.h"
diff --git a/clang/lib/Checker/RegionStore.cpp b/clang/lib/Checker/RegionStore.cpp
index b6f992995b0..a310b191813 100644
--- a/clang/lib/Checker/RegionStore.cpp
+++ b/clang/lib/Checker/RegionStore.cpp
@@ -20,9 +20,9 @@
#include "clang/Analysis/Analyses/LiveVariables.h"
#include "clang/Analysis/AnalysisContext.h"
#include "clang/Basic/TargetInfo.h"
-#include "clang/Checker/PathSensitive/GRState.h"
-#include "clang/Checker/PathSensitive/GRStateTrait.h"
-#include "clang/Checker/PathSensitive/MemRegion.h"
+#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/GRStateTrait.h"
+#include "clang/GR/PathSensitive/MemRegion.h"
#include "llvm/ADT/ImmutableList.h"
#include "llvm/ADT/ImmutableMap.h"
#include "llvm/ADT/Optional.h"
diff --git a/clang/lib/Checker/ReturnPointerRangeChecker.cpp b/clang/lib/Checker/ReturnPointerRangeChecker.cpp
index dc0712d466f..a2a9473b2c2 100644
--- a/clang/lib/Checker/ReturnPointerRangeChecker.cpp
+++ b/clang/lib/Checker/ReturnPointerRangeChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
using namespace clang;
diff --git a/clang/lib/Checker/ReturnUndefChecker.cpp b/clang/lib/Checker/ReturnUndefChecker.cpp
index 483421c8593..f5e417a1f7e 100644
--- a/clang/lib/Checker/ReturnUndefChecker.cpp
+++ b/clang/lib/Checker/ReturnUndefChecker.cpp
@@ -14,9 +14,9 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
using namespace clang;
diff --git a/clang/lib/Checker/SValBuilder.cpp b/clang/lib/Checker/SValBuilder.cpp
index 7216b70d70e..95829c2eab1 100644
--- a/clang/lib/Checker/SValBuilder.cpp
+++ b/clang/lib/Checker/SValBuilder.cpp
@@ -12,11 +12,11 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/MemRegion.h"
-#include "clang/Checker/PathSensitive/SVals.h"
-#include "clang/Checker/PathSensitive/SValBuilder.h"
-#include "clang/Checker/PathSensitive/GRState.h"
-#include "clang/Checker/PathSensitive/BasicValueFactory.h"
+#include "clang/GR/PathSensitive/MemRegion.h"
+#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/GR/PathSensitive/SValBuilder.h"
+#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/BasicValueFactory.h"
using namespace clang;
diff --git a/clang/lib/Checker/SVals.cpp b/clang/lib/Checker/SVals.cpp
index 5d131ee198e..deccc4b6656 100644
--- a/clang/lib/Checker/SVals.cpp
+++ b/clang/lib/Checker/SVals.cpp
@@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/GRState.h"
#include "clang/Basic/IdentifierTable.h"
using namespace clang;
diff --git a/clang/lib/Checker/SimpleConstraintManager.cpp b/clang/lib/Checker/SimpleConstraintManager.cpp
index 9799aa8f960..7c246e4d279 100644
--- a/clang/lib/Checker/SimpleConstraintManager.cpp
+++ b/clang/lib/Checker/SimpleConstraintManager.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "SimpleConstraintManager.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/PathSensitive/GRState.h"
-#include "clang/Checker/PathSensitive/Checker.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
+#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/Checker.h"
namespace clang {
diff --git a/clang/lib/Checker/SimpleConstraintManager.h b/clang/lib/Checker/SimpleConstraintManager.h
index 9d97512eb77..45742ebd7d0 100644
--- a/clang/lib/Checker/SimpleConstraintManager.h
+++ b/clang/lib/Checker/SimpleConstraintManager.h
@@ -14,8 +14,8 @@
#ifndef LLVM_CLANG_ANALYSIS_SIMPLE_CONSTRAINT_MANAGER_H
#define LLVM_CLANG_ANALYSIS_SIMPLE_CONSTRAINT_MANAGER_H
-#include "clang/Checker/PathSensitive/ConstraintManager.h"
-#include "clang/Checker/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/ConstraintManager.h"
+#include "clang/GR/PathSensitive/GRState.h"
namespace clang {
diff --git a/clang/lib/Checker/SimpleSValBuilder.cpp b/clang/lib/Checker/SimpleSValBuilder.cpp
index 6632c8eb1aa..1beb0550e91 100644
--- a/clang/lib/Checker/SimpleSValBuilder.cpp
+++ b/clang/lib/Checker/SimpleSValBuilder.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/SValBuilder.h"
-#include "clang/Checker/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/SValBuilder.h"
+#include "clang/GR/PathSensitive/GRState.h"
using namespace clang;
diff --git a/clang/lib/Checker/StackAddrLeakChecker.cpp b/clang/lib/Checker/StackAddrLeakChecker.cpp
index 0e9c0ecab67..1852e24fa59 100644
--- a/clang/lib/Checker/StackAddrLeakChecker.cpp
+++ b/clang/lib/Checker/StackAddrLeakChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRState.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRState.h"
#include "clang/Basic/SourceManager.h"
#include "llvm/ADT/SmallString.h"
using namespace clang;
diff --git a/clang/lib/Checker/Store.cpp b/clang/lib/Checker/Store.cpp
index 55a0efaa45b..df13ab42efd 100644
--- a/clang/lib/Checker/Store.cpp
+++ b/clang/lib/Checker/Store.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/Store.h"
-#include "clang/Checker/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/Store.h"
+#include "clang/GR/PathSensitive/GRState.h"
#include "clang/AST/CharUnits.h"
using namespace clang;
diff --git a/clang/lib/Checker/StreamChecker.cpp b/clang/lib/Checker/StreamChecker.cpp
index b72ae9580b4..dc7bd629332 100644
--- a/clang/lib/Checker/StreamChecker.cpp
+++ b/clang/lib/Checker/StreamChecker.cpp
@@ -12,11 +12,11 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineExperimentalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRState.h"
-#include "clang/Checker/PathSensitive/GRStateTrait.h"
-#include "clang/Checker/PathSensitive/SymbolManager.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/GR/PathSensitive/GRStateTrait.h"
+#include "clang/GR/PathSensitive/SymbolManager.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
diff --git a/clang/lib/Checker/SymbolManager.cpp b/clang/lib/Checker/SymbolManager.cpp
index 3b1bb6d98d9..8dcdb144145 100644
--- a/clang/lib/Checker/SymbolManager.cpp
+++ b/clang/lib/Checker/SymbolManager.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathSensitive/SymbolManager.h"
+#include "clang/GR/PathSensitive/SymbolManager.h"
#include "clang/Analysis/Analyses/LiveVariables.h"
-#include "clang/Checker/PathSensitive/MemRegion.h"
+#include "clang/GR/PathSensitive/MemRegion.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/clang/lib/Checker/TextPathDiagnostics.cpp b/clang/lib/Checker/TextPathDiagnostics.cpp
index 0ed03e426d5..343b21102b6 100644
--- a/clang/lib/Checker/TextPathDiagnostics.cpp
+++ b/clang/lib/Checker/TextPathDiagnostics.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/Checker/PathDiagnosticClients.h"
-#include "clang/Checker/BugReporter/PathDiagnostic.h"
+#include "clang/GR/PathDiagnosticClients.h"
+#include "clang/GR/BugReporter/PathDiagnostic.h"
#include "clang/Lex/Preprocessor.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/clang/lib/Checker/UndefBranchChecker.cpp b/clang/lib/Checker/UndefBranchChecker.cpp
index 1ff0641be5d..ebeb7a429da 100644
--- a/clang/lib/Checker/UndefBranchChecker.cpp
+++ b/clang/lib/Checker/UndefBranchChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/Checker.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/Checker.h"
using namespace clang;
diff --git a/clang/lib/Checker/UndefCapturedBlockVarChecker.cpp b/clang/lib/Checker/UndefCapturedBlockVarChecker.cpp
index bf788d0b81a..78b83944075 100644
--- a/clang/lib/Checker/UndefCapturedBlockVarChecker.cpp
+++ b/clang/lib/Checker/UndefCapturedBlockVarChecker.cpp
@@ -12,9 +12,9 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
-#include "clang/Checker/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
+#include "clang/GR/BugReporter/BugType.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/clang/lib/Checker/UndefResultChecker.cpp b/clang/lib/Checker/UndefResultChecker.cpp
index 851623aab50..df3ad3e9f88 100644
--- a/clang/lib/Checker/UndefResultChecker.cpp
+++ b/clang/lib/Checker/UndefResultChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
using namespace clang;
diff --git a/clang/lib/Checker/UndefinedArraySubscriptChecker.cpp b/clang/lib/Checker/UndefinedArraySubscriptChecker.cpp
index 4d5eb53d0f7..8ef3986b8d3 100644
--- a/clang/lib/Checker/UndefinedArraySubscriptChecker.cpp
+++ b/clang/lib/Checker/UndefinedArraySubscriptChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
using namespace clang;
diff --git a/clang/lib/Checker/UndefinedAssignmentChecker.cpp b/clang/lib/Checker/UndefinedAssignmentChecker.cpp
index ff31e885244..4273f0cf315 100644
--- a/clang/lib/Checker/UndefinedAssignmentChecker.cpp
+++ b/clang/lib/Checker/UndefinedAssignmentChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "GRExprEngineInternalChecks.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
using namespace clang;
diff --git a/clang/lib/Checker/UnixAPIChecker.cpp b/clang/lib/Checker/UnixAPIChecker.cpp
index 6b461cc3d9a..4f1b25f4d85 100644
--- a/clang/lib/Checker/UnixAPIChecker.cpp
+++ b/clang/lib/Checker/UnixAPIChecker.cpp
@@ -14,8 +14,8 @@
#include "GRExprEngineInternalChecks.h"
#include "clang/Basic/TargetInfo.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/StringSwitch.h"
#include <fcntl.h>
diff --git a/clang/lib/Checker/UnreachableCodeChecker.cpp b/clang/lib/Checker/UnreachableCodeChecker.cpp
index 68542197147..5f8b229ccb3 100644
--- a/clang/lib/Checker/UnreachableCodeChecker.cpp
+++ b/clang/lib/Checker/UnreachableCodeChecker.cpp
@@ -16,11 +16,11 @@
#include "clang/AST/ParentMap.h"
#include "clang/Basic/Builtins.h"
#include "clang/Basic/SourceManager.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/ExplodedGraph.h"
-#include "clang/Checker/PathSensitive/SVals.h"
-#include "clang/Checker/PathSensitive/CheckerHelpers.h"
-#include "clang/Checker/BugReporter/BugReporter.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/ExplodedGraph.h"
+#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/GR/PathSensitive/CheckerHelpers.h"
+#include "clang/GR/BugReporter/BugReporter.h"
#include "GRExprEngineExperimentalChecks.h"
#include "llvm/ADT/SmallPtrSet.h"
diff --git a/clang/lib/Checker/VLASizeChecker.cpp b/clang/lib/Checker/VLASizeChecker.cpp
index 4d24413d327..8c4d903c1a1 100644
--- a/clang/lib/Checker/VLASizeChecker.cpp
+++ b/clang/lib/Checker/VLASizeChecker.cpp
@@ -16,9 +16,9 @@
#include "GRExprEngineInternalChecks.h"
#include "clang/AST/CharUnits.h"
-#include "clang/Checker/BugReporter/BugType.h"
-#include "clang/Checker/PathSensitive/CheckerVisitor.h"
-#include "clang/Checker/PathSensitive/GRExprEngine.h"
+#include "clang/GR/BugReporter/BugType.h"
+#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/GR/PathSensitive/GRExprEngine.h"
using namespace clang;
diff --git a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
index de87fbdab3c..ed9ff7591f5 100644
--- a/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
+++ b/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp
@@ -13,7 +13,7 @@
//===----------------------------------------------------------------------===//
#include "clang/FrontendTool/Utils.h"
-#include "clang/Checker/FrontendActions.h"
+#include "clang/GR/FrontendActions.h"
#include "clang/CodeGen/CodeGenAction.h"
#include "clang/Driver/CC1Options.h"
#include "clang/Driver/OptTable.h"
OpenPOWER on IntegriCloud