Rename headers: 'clang/GR' 'clang/EntoSA' and

update Makefile.

llvm-svn: 122493

clang/examples/PrintFunctionNames/CMakeLists.txt

@@ -10,8 +10,8 @@ set( LLVM_USED_LIBS
   clangCodeGen
   clangParse
   clangSema
-  clangGRCheckers
-  clangGRCore
+  clangEntoCheckers
+  clangEntoCore
   clangAnalysis
   clangIndex
   clangRewrite

clang/examples/clang-interpreter/CMakeLists.txt

@@ -6,8 +6,8 @@ set(LLVM_USED_LIBS
     clangDriver
     clangCodeGen
     clangSema
-    clangGRCheckers
-    clangGRCore
+    clangEntoCheckers
+    clangEntoCore
     clangIndex
     clangAnalysis
     clangRewrite

clang/examples/clang-interpreter/Makefile

@@ -18,7 +18,7 @@ TOOL_NO_EXPORTS = 1
 LINK_COMPONENTS := jit interpreter nativecodegen bitreader bitwriter ipo \
 	selectiondag asmparser
 USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a clangCodeGen.a \
-           clangSema.a clangGRCheckers.a clangGRCore.a clangAnalysis.a clangRewrite.a \
+           clangSema.a clangEntoCheckers.a clangEntoCore.a clangAnalysis.a clangRewrite.a \
            clangAST.a clangParse.a clangLex.a clangBasic.a
 
 include $(CLANG_LEVEL)/Makefile

clang/examples/wpa/CMakeLists.txt

@@ -7,8 +7,8 @@ set(LLVM_USED_LIBS
   clangSema
   clangAnalysis
   clangSerialization
-  clangGRCheckers
-  clangGRCore
+  clangEntoCheckers
+  clangEntoCore
   clangRewrite
   clangAST
   clangParse

clang/examples/wpa/Makefile

@@ -16,7 +16,7 @@ NO_INSTALL = 1
 TOOL_NO_EXPORTS = 1
 
 LINK_COMPONENTS := asmparser bitreader mc core
-USEDLIBS = clangGRCheckers.a clangGRCore.a clangIndex.a clangFrontend.a clangDriver.a \
+USEDLIBS = clangEntoCheckers.a clangEntoCore.a clangIndex.a clangFrontend.a clangDriver.a \
 	   clangSema.a clangAnalysis.a clangSerialization.a \
            clangAST.a clangParse.a clangLex.a clangBasic.a
 

clang/include/clang/EntoSA/BugReporter/BugReporter.h

@@ -16,7 +16,7 @@
 #define LLVM_CLANG_GR_BUGREPORTER
 
 #include "clang/Basic/SourceLocation.h"
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/ImmutableList.h"
 #include "llvm/ADT/ImmutableSet.h"

clang/include/clang/EntoSA/BugReporter/BugType.h

@@ -14,7 +14,7 @@
 #ifndef LLVM_CLANG_ANALYSIS_BUGTYPE
 #define LLVM_CLANG_ANALYSIS_BUGTYPE
 
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include "llvm/ADT/FoldingSet.h"
 #include <string>
 

clang/include/clang/EntoSA/ManagerRegistry.h

@@ -14,7 +14,7 @@
 #ifndef LLVM_CLANG_GR_MANAGER_REGISTRY_H
 #define LLVM_CLANG_GR_MANAGER_REGISTRY_H
 
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 
 namespace clang {
 

clang/include/clang/EntoSA/PathSensitive/AnalysisManager.h

@@ -16,8 +16,8 @@
 #define LLVM_CLANG_GR_ANALYSISMANAGER_H
 
 #include "clang/Analysis/AnalysisContext.h"
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
 
 namespace clang {
 

clang/include/clang/EntoSA/PathSensitive/BasicValueFactory.h

@@ -16,7 +16,7 @@
 #ifndef LLVM_CLANG_GR_BASICVALUEFACTORY_H
 #define LLVM_CLANG_GR_BASICVALUEFACTORY_H
 
-#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
 #include "clang/AST/ASTContext.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/APSInt.h"

clang/include/clang/EntoSA/PathSensitive/Checker.h

@@ -16,7 +16,7 @@
 #define LLVM_CLANG_GR_CHECKER
 
 #include "clang/Analysis/Support/SaveAndRestore.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 
 //===----------------------------------------------------------------------===//
 // Checker interface.

clang/include/clang/EntoSA/PathSensitive/CheckerVisitor.h

@@ -13,7 +13,7 @@
 
 #ifndef LLVM_CLANG_GR_CHECKERVISITOR
 #define LLVM_CLANG_GR_CHECKERVISITOR
-#include "clang/GR/PathSensitive/Checker.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
 
 namespace clang {
 
@@ -51,7 +51,7 @@ public:
 case Stmt::NAME ## Class:\
 static_cast<ImplClass*>(this)->PreVisit ## NAME(C,static_cast<const NAME*>(S));\
 break;
-#include "clang/GR/PathSensitive/CheckerVisitor.def"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.def"
     }
   }
   
@@ -70,7 +70,7 @@ case Stmt::NAME ## Class:\
 static_cast<ImplClass*>(this)->\
 PostVisit ## NAME(C,static_cast<const NAME*>(S));\
 break;
-#include "clang/GR/PathSensitive/CheckerVisitor.def"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.def"
     }
   }
 
@@ -101,7 +101,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/GR/PathSensitive/CheckerVisitor.def"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.def"
 };
 
 } // end GR namespace

clang/include/clang/EntoSA/PathSensitive/ConstraintManager.h

@@ -15,7 +15,7 @@
 #define LLVM_CLANG_GR_CONSTRAINT_MANAGER_H
 
 // FIXME: Typedef LiveSymbolsTy/DeadSymbolsTy at a more appropriate place.
-#include "clang/GR/PathSensitive/Store.h"
+#include "clang/EntoSA/PathSensitive/Store.h"
 
 namespace llvm {
 class APSInt;

clang/include/clang/EntoSA/PathSensitive/CoreEngine.h

@@ -16,10 +16,10 @@
 #define LLVM_CLANG_GR_COREENGINE
 
 #include "clang/AST/Expr.h"
-#include "clang/GR/PathSensitive/ExplodedGraph.h"
-#include "clang/GR/PathSensitive/WorkList.h"
-#include "clang/GR/PathSensitive/BlockCounter.h"
-#include "clang/GR/PathSensitive/SubEngine.h"
+#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
+#include "clang/EntoSA/PathSensitive/WorkList.h"
+#include "clang/EntoSA/PathSensitive/BlockCounter.h"
+#include "clang/EntoSA/PathSensitive/SubEngine.h"
 #include "llvm/ADT/OwningPtr.h"
 
 namespace clang {

clang/include/clang/EntoSA/PathSensitive/Environment.h

@@ -14,8 +14,8 @@
 #ifndef LLVM_CLANG_GR_ENVIRONMENT_H
 #define LLVM_CLANG_GR_ENVIRONMENT_H
 
-#include "clang/GR/PathSensitive/Store.h"
-#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/EntoSA/PathSensitive/Store.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
 #include "llvm/ADT/ImmutableMap.h"
 
 namespace clang {

clang/include/clang/EntoSA/PathSensitive/ExprEngine.h

@@ -16,12 +16,12 @@
 #ifndef LLVM_CLANG_GR_EXPRENGINE
 #define LLVM_CLANG_GR_EXPRENGINE
 
-#include "clang/GR/PathSensitive/AnalysisManager.h"
-#include "clang/GR/PathSensitive/SubEngine.h"
-#include "clang/GR/PathSensitive/CoreEngine.h"
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/PathSensitive/TransferFuncs.h"
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
+#include "clang/EntoSA/PathSensitive/SubEngine.h"
+#include "clang/EntoSA/PathSensitive/CoreEngine.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include "clang/AST/Type.h"
 #include "clang/AST/ExprObjC.h"
 #include "clang/AST/ExprCXX.h"

clang/include/clang/EntoSA/PathSensitive/ExprEngineBuilders.h

@@ -14,7 +14,7 @@
 
 #ifndef LLVM_CLANG_GR_EXPRENGINE_BUILDERS
 #define LLVM_CLANG_GR_EXPRENGINE_BUILDERS
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 #include "clang/Analysis/Support/SaveAndRestore.h"
 
 namespace clang {

clang/include/clang/EntoSA/PathSensitive/GRState.h

@@ -14,10 +14,10 @@
 #ifndef LLVM_CLANG_GR_VALUESTATE_H
 #define LLVM_CLANG_GR_VALUESTATE_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 "clang/EntoSA/PathSensitive/ConstraintManager.h"
+#include "clang/EntoSA/PathSensitive/Environment.h"
+#include "clang/EntoSA/PathSensitive/Store.h"
+#include "clang/EntoSA/PathSensitive/SValBuilder.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/ImmutableMap.h"
 #include "llvm/Support/Casting.h"

clang/include/clang/EntoSA/PathSensitive/MemRegion.h

@@ -18,7 +18,7 @@
 
 #include "clang/AST/Decl.h"
 #include "clang/AST/DeclObjC.h"
-#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/ADT/FoldingSet.h"

clang/include/clang/EntoSA/PathSensitive/SValBuilder.h

@@ -17,9 +17,9 @@
 
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprCXX.h"
-#include "clang/GR/PathSensitive/SVals.h"
-#include "clang/GR/PathSensitive/BasicValueFactory.h"
-#include "clang/GR/PathSensitive/MemRegion.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
+#include "clang/EntoSA/PathSensitive/BasicValueFactory.h"
+#include "clang/EntoSA/PathSensitive/MemRegion.h"
 
 namespace clang {
 

clang/include/clang/EntoSA/PathSensitive/SVals.h

@@ -15,7 +15,7 @@
 #ifndef LLVM_CLANG_GR_RVALUE_H
 #define LLVM_CLANG_GR_RVALUE_H
 
-#include "clang/GR/PathSensitive/SymbolManager.h"
+#include "clang/EntoSA/PathSensitive/SymbolManager.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/ADT/ImmutableList.h"
 

clang/include/clang/EntoSA/PathSensitive/Store.h

@@ -14,8 +14,8 @@
 #ifndef LLVM_CLANG_GR_STORE_H
 #define LLVM_CLANG_GR_STORE_H
 
-#include "clang/GR/PathSensitive/MemRegion.h"
-#include "clang/GR/PathSensitive/SValBuilder.h"
+#include "clang/EntoSA/PathSensitive/MemRegion.h"
+#include "clang/EntoSA/PathSensitive/SValBuilder.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/Optional.h"
 

clang/include/clang/EntoSA/PathSensitive/SubEngine.h

@@ -13,7 +13,7 @@
 #ifndef LLVM_CLANG_GR_SUBENGINE_H
 #define LLVM_CLANG_GR_SUBENGINE_H
 
-#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
 
 namespace clang {
 

clang/include/clang/EntoSA/PathSensitive/TransferFuncs.h

@@ -15,8 +15,8 @@
 #ifndef LLVM_CLANG_GR_TRANSFERFUNCS
 #define LLVM_CLANG_GR_TRANSFERFUNCS
 
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
 #include <vector>
 
 namespace clang {

clang/include/clang/EntoSA/PathSensitive/WorkList.h

@@ -15,7 +15,7 @@
 #ifndef LLVM_CLANG_GR_WORKLIST
 #define LLVM_CLANG_GR_WORKLIST
 
-#include "clang/GR/PathSensitive/BlockCounter.h"
+#include "clang/EntoSA/PathSensitive/BlockCounter.h"
 #include <cstddef>
 
 namespace clang {

clang/lib/CMakeLists.txt

@@ -12,5 +12,5 @@ add_subdirectory(Serialization)
 add_subdirectory(Frontend)
 add_subdirectory(FrontendTool)
 add_subdirectory(Index)
-add_subdirectory(GR)
-add_subdirectory(GR/Checkers)
+add_subdirectory(EntoSA)
+add_subdirectory(EntoSA/Checkers)

clang/lib/EntoSA/AggExprVisitor.cpp

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 #include "clang/AST/StmtVisitor.h"
 
 using namespace clang;

clang/lib/EntoSA/AnalysisManager.cpp

@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/AnalysisManager.h"
+#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
 #include "clang/Index/Entity.h"
 #include "clang/Index/Indexer.h"
 

clang/lib/EntoSA/AnalyzerStatsChecker.cpp

@@ -9,9 +9,9 @@
 // This file reports various statistics about analyzer visitation.
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExplodedGraph.h"
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 
 // FIXME: Restructure checker registration.
 #include "Checkers/ExprEngineExperimentalChecks.h"

clang/lib/EntoSA/BasicConstraintManager.cpp

@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "SimpleConstraintManager.h"
-#include "clang/GR/PathSensitive/GRState.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
-#include "clang/GR/PathSensitive/TransferFuncs.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;

clang/lib/EntoSA/BasicStore.cpp

@@ -15,7 +15,7 @@
 #include "clang/AST/ExprObjC.h"
 #include "clang/Analysis/Analyses/LiveVariables.h"
 #include "clang/Analysis/AnalysisContext.h"
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 #include "llvm/ADT/ImmutableMap.h"
 
 using namespace clang;

clang/lib/EntoSA/BasicValueFactory.cpp

@@ -13,7 +13,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/BasicValueFactory.h"
+#include "clang/EntoSA/PathSensitive/BasicValueFactory.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/BlockCounter.cpp

@@ -13,7 +13,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/BlockCounter.h"
+#include "clang/EntoSA/PathSensitive/BlockCounter.h"
 #include "llvm/ADT/ImmutableMap.h"
 
 using namespace clang;

clang/lib/EntoSA/BugReporter.cpp

@@ -12,9 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.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/GR/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/STLExtras.h"

clang/lib/EntoSA/BugReporterVisitors.cpp

@@ -14,10 +14,10 @@
 
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprObjC.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"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/CFRefCount.cpp

@@ -16,15 +16,15 @@
 #include "clang/AST/StmtVisitor.h"
 #include "clang/Basic/LangOptions.h"
 #include "clang/Basic/SourceManager.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
-#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
 #include "clang/Analysis/DomainSpecific/CocoaConventions.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngineBuilders.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
-#include "clang/GR/PathSensitive/TransferFuncs.h"
-#include "clang/GR/PathSensitive/SymbolManager.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngineBuilders.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
+#include "clang/EntoSA/PathSensitive/SymbolManager.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/FoldingSet.h"
 #include "llvm/ADT/ImmutableList.h"

clang/lib/EntoSA/CMakeLists.txt

@@ -2,7 +2,7 @@ set(LLVM_NO_RTTI 1)
 
 set(LLVM_USED_LIBS clangBasic clangLex clangAST clangFrontend clangRewrite)
 
-add_clang_library(clangGRCore
+add_clang_library(clangEntoCore
   AggExprVisitor.cpp
   AnalysisManager.cpp
   AnalyzerStatsChecker.cpp
@@ -37,5 +37,5 @@ add_clang_library(clangGRCore
   TextPathDiagnostics.cpp
   )
 
-add_dependencies(clangGRCore ClangAttrClasses ClangAttrList ClangDeclNodes
+add_dependencies(clangEntoCore ClangAttrClasses ClangAttrList ClangDeclNodes
                  ClangStmtNodes)

clang/lib/EntoSA/CXXExprEngine.cpp

@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/AnalysisManager.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 #include "clang/AST/DeclCXX.h"
 
 using namespace clang;

clang/lib/EntoSA/Checker.cpp

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/Checker.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
 using namespace clang;
 using namespace ento;
 

clang/lib/EntoSA/CheckerHelpers.cpp

@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/CheckerHelpers.h"
+#include "clang/EntoSA/PathSensitive/CheckerHelpers.h"
 #include "clang/AST/Expr.h"
 
 // Recursively find any substatements containing macros

clang/lib/EntoSA/Checkers/AdjustedReturnValueChecker.cpp

@@ -14,9 +14,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/AnalysisConsumer.cpp

@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/AnalysisConsumer.h"
+#include "clang/EntoSA/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/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/ExprEngine.h"
-#include "clang/GR/PathSensitive/TransferFuncs.h"
-#include "clang/GR/PathDiagnosticClients.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/ManagerRegistry.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
+#include "clang/EntoSA/PathDiagnosticClients.h"
 
 // FIXME: Restructure checker registration.
 #include "ExprEngineExperimentalChecks.h"

clang/lib/EntoSA/Checkers/ArrayBoundChecker.cpp

@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/ArrayBoundCheckerV2.cpp

@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 #include "clang/AST/CharUnits.h"
 
 using namespace clang;

clang/lib/EntoSA/Checkers/AttrNonNullChecker.cpp

@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/BasicObjCFoundationChecks.cpp

@@ -15,14 +15,14 @@
 
 #include "BasicObjCFoundationChecks.h"
 
-#include "clang/GR/PathSensitive/ExplodedGraph.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.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/EntoSA/PathSensitive/ExplodedGraph.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/MemRegion.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/ExprObjC.h"

clang/lib/EntoSA/Checkers/BuiltinFunctionChecker.cpp

@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/PathSensitive/Checker.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
 #include "clang/Basic/Builtins.h"
 
 using namespace clang;

clang/lib/EntoSA/Checkers/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_clang_library(clangGRCheckers
+add_clang_library(clangEntoCheckers
   AdjustedReturnValueChecker.cpp
   AnalysisConsumer.cpp
   ArrayBoundChecker.cpp
@@ -49,5 +49,5 @@ add_clang_library(clangGRCheckers
   VLASizeChecker.cpp
   )
 
-add_dependencies(clangGRCore ClangAttrClasses ClangAttrList ClangDeclNodes
+add_dependencies(clangEntoCore ClangAttrClasses ClangAttrList ClangDeclNodes
                  ClangStmtNodes)

clang/lib/EntoSA/Checkers/CStringChecker.cpp

@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineExperimentalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
 #include "llvm/ADT/StringSwitch.h"
 
 using namespace clang;

clang/lib/EntoSA/Checkers/CallAndMessageChecker.cpp

@@ -15,8 +15,8 @@
 #include "ExprEngineInternalChecks.h"
 #include "clang/AST/ParentMap.h"
 #include "clang/Basic/TargetInfo.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/CastSizeChecker.cpp

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 #include "clang/AST/CharUnits.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 #include "ExprEngineInternalChecks.h"
 
 using namespace clang;

clang/lib/EntoSA/Checkers/CastToStructChecker.cpp

@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 #include "ExprEngineInternalChecks.h"
 
 using namespace clang;

clang/lib/EntoSA/Checkers/CheckDeadStores.cpp

@@ -12,11 +12,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
 #include "clang/Analysis/Analyses/LiveVariables.h"
 #include "clang/Analysis/Visitors/CFGRecStmtVisitor.h"
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 #include "clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/AST/ASTContext.h"

clang/lib/EntoSA/Checkers/CheckObjCDealloc.cpp

@@ -13,9 +13,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/Checkers/LocalCheckers.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include "clang/AST/ExprObjC.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/DeclObjC.h"

clang/lib/EntoSA/Checkers/CheckObjCInstMethSignature.cpp

@@ -13,9 +13,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/Checkers/LocalCheckers.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Type.h"
 #include "clang/AST/ASTContext.h"

clang/lib/EntoSA/Checkers/CheckSecuritySyntaxOnly.cpp

@@ -12,8 +12,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Basic/TargetInfo.h"
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
 #include "clang/AST/StmtVisitor.h"
 #include "llvm/Support/raw_ostream.h"
 

clang/lib/EntoSA/Checkers/CheckSizeofPointer.cpp

@@ -12,9 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include "clang/AST/StmtVisitor.h"
-#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/ChrootChecker.cpp

@@ -12,11 +12,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineExperimentalChecks.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 "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/SymbolManager.h"
 #include "llvm/ADT/ImmutableMap.h"
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/DereferenceChecker.cpp

@@ -13,10 +13,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/Checkers/DereferenceChecker.h"
-#include "clang/GR/PathSensitive/Checker.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/Checkers/DereferenceChecker.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/DivZeroChecker.cpp

@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/ExprEngine.cpp

@@ -16,11 +16,11 @@
 // FIXME: Restructure checker registration.
 #include "ExprEngineInternalChecks.h"
 
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/AnalysisManager.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
-#include "clang/GR/PathSensitive/ExprEngineBuilders.h"
-#include "clang/GR/PathSensitive/Checker.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/ExprEngineBuilders.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
 #include "clang/AST/CharUnits.h"
 #include "clang/AST/ParentMap.h"
 #include "clang/AST/StmtObjC.h"

clang/lib/EntoSA/Checkers/ExprEngineExperimentalChecks.cpp

@@ -14,7 +14,7 @@
 
 #include "ExprEngineInternalChecks.h"
 #include "ExprEngineExperimentalChecks.h"
-#include "clang/GR/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/FixedAddressChecker.cpp

@@ -14,8 +14,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/FrontendActions.cpp

@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/FrontendActions.h"
+#include "clang/EntoSA/FrontendActions.h"
 #include "clang/Frontend/CompilerInstance.h"
-#include "clang/GR/AnalysisConsumer.h"
+#include "clang/EntoSA/AnalysisConsumer.h"
 using namespace clang;
 using namespace ento;
 

clang/lib/EntoSA/Checkers/IdempotentOperationChecker.cpp

@@ -45,12 +45,12 @@
 #include "ExprEngineExperimentalChecks.h"
 #include "clang/Analysis/CFGStmtMap.h"
 #include "clang/Analysis/Analyses/PseudoConstantAnalysis.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/CoreEngine.h"
-#include "clang/GR/PathSensitive/SVals.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerHelpers.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/CoreEngine.h"
+#include "clang/EntoSA/PathSensitive/SVals.h"
 #include "clang/AST/Stmt.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallSet.h"

clang/lib/EntoSA/Checkers/LLVMConventionsChecker.cpp

@@ -14,8 +14,8 @@
 
 #include "clang/AST/DeclTemplate.h"
 #include "clang/AST/StmtVisitor.h"
-#include "clang/GR/Checkers/LocalCheckers.h"
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include <string>
 #include "llvm/ADT/StringRef.h"
 

clang/lib/EntoSA/Checkers/MacOSXAPIChecker.cpp

@@ -17,9 +17,9 @@
 
 #include "ExprEngineInternalChecks.h"
 #include "clang/Basic/TargetInfo.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/raw_ostream.h"

clang/lib/EntoSA/Checkers/Makefile

@@ -12,6 +12,6 @@
 ##===----------------------------------------------------------------------===##
 
 CLANG_LEVEL := ../../..
-LIBRARYNAME := clangGRCheckers
+LIBRARYNAME := clangEntoCheckers
 
 include $(CLANG_LEVEL)/Makefile

clang/lib/EntoSA/Checkers/MallocChecker.cpp

@@ -13,11 +13,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineExperimentalChecks.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 "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/SymbolManager.h"
 #include "llvm/ADT/ImmutableMap.h"
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/NSAutoreleasePoolChecker.cpp

@@ -15,9 +15,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 #include "BasicObjCFoundationChecks.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Decl.h"

clang/lib/EntoSA/Checkers/NSErrorChecker.cpp

@@ -15,10 +15,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/Checkers/LocalCheckers.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
-#include "clang/GR/Checkers/DereferenceChecker.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/Checkers/DereferenceChecker.h"
 #include "BasicObjCFoundationChecks.h"
 #include "clang/AST/DeclObjC.h"
 #include "clang/AST/Decl.h"

clang/lib/EntoSA/Checkers/NoReturnFunctionChecker.cpp

@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 #include "llvm/ADT/StringSwitch.h"
 
 using namespace clang;

clang/lib/EntoSA/Checkers/OSAtomicChecker.cpp

@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/PathSensitive/Checker.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
 #include "clang/Basic/Builtins.h"
 
 using namespace clang;

clang/lib/EntoSA/Checkers/ObjCAtSyncChecker.cpp

@@ -13,10 +13,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/Checkers/DereferenceChecker.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/Checkers/DereferenceChecker.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/ObjCUnusedIVarsChecker.cpp

@@ -13,9 +13,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/Checkers/LocalCheckers.h"
-#include "clang/GR/BugReporter/PathDiagnostic.h"
-#include "clang/GR/BugReporter/BugReporter.h"
+#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
 #include "clang/AST/ExprObjC.h"
 #include "clang/AST/Expr.h"
 #include "clang/AST/DeclObjC.h"

clang/lib/EntoSA/Checkers/PointerArithChecker.cpp

@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/PointerSubChecker.cpp

@@ -14,8 +14,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/PthreadLockChecker.cpp

@@ -12,9 +12,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/BugReporter/BugReporter.h"
-#include "clang/GR/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
 #include "ExprEngineExperimentalChecks.h"
 #include "llvm/ADT/ImmutableSet.h"
 

clang/lib/EntoSA/Checkers/ReturnPointerRangeChecker.cpp

@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/ReturnUndefChecker.cpp

@@ -14,9 +14,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/StackAddrLeakChecker.cpp

@@ -13,9 +13,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/GRState.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
 #include "clang/Basic/SourceManager.h"
 #include "llvm/ADT/SmallString.h"
 using namespace clang;

clang/lib/EntoSA/Checkers/StreamChecker.cpp

@@ -12,11 +12,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineExperimentalChecks.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 "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/EntoSA/PathSensitive/SymbolManager.h"
 #include "llvm/ADT/ImmutableMap.h"
 
 using namespace clang;

clang/lib/EntoSA/Checkers/UndefBranchChecker.cpp

@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/BugReporter/BugType.h"
-#include "clang/GR/PathSensitive/Checker.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/Checker.h"
 
 using namespace clang;
 using namespace ento;

clang/lib/EntoSA/Checkers/UndefCapturedBlockVarChecker.cpp

@@ -12,9 +12,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "ExprEngineInternalChecks.h"
-#include "clang/GR/PathSensitive/CheckerVisitor.h"
-#include "clang/GR/PathSensitive/ExprEngine.h"
-#include "clang/GR/BugReporter/BugType.h"
+#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/EntoSA/BugReporter/BugType.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace clang;