Chris Lattner has strong opinions about directory
layout. :)
Rename the 'EntoSA' directories to 'StaticAnalyzer'.
Internally we will still use the 'ento' namespace
for the analyzer engine (unless there are further
sabre rattlings...).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@122514 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/examples/PrintFunctionNames/CMakeLists.txt b/examples/PrintFunctionNames/CMakeLists.txt
index ee45187..edfbcb5 100644
--- a/examples/PrintFunctionNames/CMakeLists.txt
+++ b/examples/PrintFunctionNames/CMakeLists.txt
@@ -10,8 +10,8 @@
clangCodeGen
clangParse
clangSema
- clangEntoCheckers
- clangEntoCore
+ clangStaticAnalyzerCheckers
+ clangStaticAnalyzerCore
clangAnalysis
clangIndex
clangRewrite
diff --git a/examples/clang-interpreter/CMakeLists.txt b/examples/clang-interpreter/CMakeLists.txt
index c8c3c2b..21c5afd 100644
--- a/examples/clang-interpreter/CMakeLists.txt
+++ b/examples/clang-interpreter/CMakeLists.txt
@@ -6,8 +6,8 @@
clangDriver
clangCodeGen
clangSema
- clangEntoCheckers
- clangEntoCore
+ clangStaticAnalyzerCheckers
+ clangStaticAnalyzerCore
clangIndex
clangAnalysis
clangRewrite
diff --git a/examples/clang-interpreter/Makefile b/examples/clang-interpreter/Makefile
index 86bc9ca..24a2be8 100644
--- a/examples/clang-interpreter/Makefile
+++ b/examples/clang-interpreter/Makefile
@@ -18,7 +18,7 @@
LINK_COMPONENTS := jit interpreter nativecodegen bitreader bitwriter ipo \
selectiondag asmparser
USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a clangCodeGen.a \
- clangSema.a clangEntoCheckers.a clangEntoCore.a clangAnalysis.a clangRewrite.a \
+ clangSema.a clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a clangAnalysis.a clangRewrite.a \
clangAST.a clangParse.a clangLex.a clangBasic.a
include $(CLANG_LEVEL)/Makefile
diff --git a/examples/wpa/CMakeLists.txt b/examples/wpa/CMakeLists.txt
index 0100aa2..e3aaf1d 100644
--- a/examples/wpa/CMakeLists.txt
+++ b/examples/wpa/CMakeLists.txt
@@ -7,8 +7,8 @@
clangSema
clangAnalysis
clangSerialization
- clangEntoCheckers
- clangEntoCore
+ clangStaticAnalyzerCheckers
+ clangStaticAnalyzerCore
clangRewrite
clangAST
clangParse
diff --git a/examples/wpa/Makefile b/examples/wpa/Makefile
index 4fbba9d..af0f843 100644
--- a/examples/wpa/Makefile
+++ b/examples/wpa/Makefile
@@ -16,7 +16,7 @@
TOOL_NO_EXPORTS = 1
LINK_COMPONENTS := asmparser bitreader mc core
-USEDLIBS = clangEntoCheckers.a clangEntoCore.a clangIndex.a clangFrontend.a clangDriver.a \
+USEDLIBS = clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a clangIndex.a clangFrontend.a clangDriver.a \
clangSema.a clangAnalysis.a clangSerialization.a \
clangAST.a clangParse.a clangLex.a clangBasic.a
diff --git a/include/clang/EntoSA/AnalysisConsumer.h b/include/clang/StaticAnalyzer/AnalysisConsumer.h
similarity index 100%
copy from include/clang/EntoSA/AnalysisConsumer.h
copy to include/clang/StaticAnalyzer/AnalysisConsumer.h
diff --git a/include/clang/EntoSA/BugReporter/BugReporter.h b/include/clang/StaticAnalyzer/BugReporter/BugReporter.h
similarity index 99%
rename from include/clang/EntoSA/BugReporter/BugReporter.h
rename to include/clang/StaticAnalyzer/BugReporter/BugReporter.h
index c879d3c..a5b1980 100644
--- a/include/clang/EntoSA/BugReporter/BugReporter.h
+++ b/include/clang/StaticAnalyzer/BugReporter/BugReporter.h
@@ -16,7 +16,7 @@
#define LLVM_CLANG_GR_BUGREPORTER
#include "clang/Basic/SourceLocation.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/ImmutableList.h"
#include "llvm/ADT/ImmutableSet.h"
diff --git a/include/clang/EntoSA/BugReporter/BugType.h b/include/clang/StaticAnalyzer/BugReporter/BugType.h
similarity index 97%
rename from include/clang/EntoSA/BugReporter/BugType.h
rename to include/clang/StaticAnalyzer/BugReporter/BugType.h
index 1eee141..6e6ec54 100644
--- a/include/clang/EntoSA/BugReporter/BugType.h
+++ b/include/clang/StaticAnalyzer/BugReporter/BugType.h
@@ -14,7 +14,7 @@
#ifndef LLVM_CLANG_ANALYSIS_BUGTYPE
#define LLVM_CLANG_ANALYSIS_BUGTYPE
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include "llvm/ADT/FoldingSet.h"
#include <string>
diff --git a/include/clang/EntoSA/BugReporter/PathDiagnostic.h b/include/clang/StaticAnalyzer/BugReporter/PathDiagnostic.h
similarity index 100%
copy from include/clang/EntoSA/BugReporter/PathDiagnostic.h
copy to include/clang/StaticAnalyzer/BugReporter/PathDiagnostic.h
diff --git a/include/clang/EntoSA/Checkers/DereferenceChecker.h b/include/clang/StaticAnalyzer/Checkers/DereferenceChecker.h
similarity index 100%
copy from include/clang/EntoSA/Checkers/DereferenceChecker.h
copy to include/clang/StaticAnalyzer/Checkers/DereferenceChecker.h
diff --git a/include/clang/EntoSA/Checkers/LocalCheckers.h b/include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
similarity index 100%
copy from include/clang/EntoSA/Checkers/LocalCheckers.h
copy to include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
diff --git a/include/clang/EntoSA/AnalysisConsumer.h b/include/clang/StaticAnalyzer/EntoSA/AnalysisConsumer.h
similarity index 100%
rename from include/clang/EntoSA/AnalysisConsumer.h
rename to include/clang/StaticAnalyzer/EntoSA/AnalysisConsumer.h
diff --git a/include/clang/EntoSA/BugReporter/BugReporter.h b/include/clang/StaticAnalyzer/EntoSA/BugReporter/BugReporter.h
similarity index 99%
copy from include/clang/EntoSA/BugReporter/BugReporter.h
copy to include/clang/StaticAnalyzer/EntoSA/BugReporter/BugReporter.h
index c879d3c..a5b1980 100644
--- a/include/clang/EntoSA/BugReporter/BugReporter.h
+++ b/include/clang/StaticAnalyzer/EntoSA/BugReporter/BugReporter.h
@@ -16,7 +16,7 @@
#define LLVM_CLANG_GR_BUGREPORTER
#include "clang/Basic/SourceLocation.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/ImmutableList.h"
#include "llvm/ADT/ImmutableSet.h"
diff --git a/include/clang/EntoSA/BugReporter/BugType.h b/include/clang/StaticAnalyzer/EntoSA/BugReporter/BugType.h
similarity index 97%
copy from include/clang/EntoSA/BugReporter/BugType.h
copy to include/clang/StaticAnalyzer/EntoSA/BugReporter/BugType.h
index 1eee141..6e6ec54 100644
--- a/include/clang/EntoSA/BugReporter/BugType.h
+++ b/include/clang/StaticAnalyzer/EntoSA/BugReporter/BugType.h
@@ -14,7 +14,7 @@
#ifndef LLVM_CLANG_ANALYSIS_BUGTYPE
#define LLVM_CLANG_ANALYSIS_BUGTYPE
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include "llvm/ADT/FoldingSet.h"
#include <string>
diff --git a/include/clang/EntoSA/BugReporter/PathDiagnostic.h b/include/clang/StaticAnalyzer/EntoSA/BugReporter/PathDiagnostic.h
similarity index 100%
rename from include/clang/EntoSA/BugReporter/PathDiagnostic.h
rename to include/clang/StaticAnalyzer/EntoSA/BugReporter/PathDiagnostic.h
diff --git a/include/clang/EntoSA/Checkers/DereferenceChecker.h b/include/clang/StaticAnalyzer/EntoSA/Checkers/DereferenceChecker.h
similarity index 100%
rename from include/clang/EntoSA/Checkers/DereferenceChecker.h
rename to include/clang/StaticAnalyzer/EntoSA/Checkers/DereferenceChecker.h
diff --git a/include/clang/EntoSA/Checkers/LocalCheckers.h b/include/clang/StaticAnalyzer/EntoSA/Checkers/LocalCheckers.h
similarity index 100%
rename from include/clang/EntoSA/Checkers/LocalCheckers.h
rename to include/clang/StaticAnalyzer/EntoSA/Checkers/LocalCheckers.h
diff --git a/include/clang/EntoSA/FrontendActions.h b/include/clang/StaticAnalyzer/EntoSA/FrontendActions.h
similarity index 100%
rename from include/clang/EntoSA/FrontendActions.h
rename to include/clang/StaticAnalyzer/EntoSA/FrontendActions.h
diff --git a/include/clang/EntoSA/ManagerRegistry.h b/include/clang/StaticAnalyzer/EntoSA/ManagerRegistry.h
similarity index 96%
rename from include/clang/EntoSA/ManagerRegistry.h
rename to include/clang/StaticAnalyzer/EntoSA/ManagerRegistry.h
index 43657a5..1b84980 100644
--- a/include/clang/EntoSA/ManagerRegistry.h
+++ b/include/clang/StaticAnalyzer/EntoSA/ManagerRegistry.h
@@ -14,7 +14,7 @@
#ifndef LLVM_CLANG_GR_MANAGER_REGISTRY_H
#define LLVM_CLANG_GR_MANAGER_REGISTRY_H
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
namespace clang {
diff --git a/include/clang/EntoSA/PathDiagnosticClients.h b/include/clang/StaticAnalyzer/EntoSA/PathDiagnosticClients.h
similarity index 100%
rename from include/clang/EntoSA/PathDiagnosticClients.h
rename to include/clang/StaticAnalyzer/EntoSA/PathDiagnosticClients.h
diff --git a/include/clang/EntoSA/PathSensitive/AnalysisManager.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/AnalysisManager.h
similarity index 97%
rename from include/clang/EntoSA/PathSensitive/AnalysisManager.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/AnalysisManager.h
index 95d954e..ba86ed8 100644
--- a/include/clang/EntoSA/PathSensitive/AnalysisManager.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/AnalysisManager.h
@@ -16,8 +16,8 @@
#define LLVM_CLANG_GR_ANALYSISMANAGER_H
#include "clang/Analysis/AnalysisContext.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
namespace clang {
diff --git a/include/clang/EntoSA/PathSensitive/BasicValueFactory.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/BasicValueFactory.h
similarity index 98%
rename from include/clang/EntoSA/PathSensitive/BasicValueFactory.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/BasicValueFactory.h
index 061508e..4cac8b6 100644
--- a/include/clang/EntoSA/PathSensitive/BasicValueFactory.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/BasicValueFactory.h
@@ -16,7 +16,7 @@
#ifndef LLVM_CLANG_GR_BASICVALUEFACTORY_H
#define LLVM_CLANG_GR_BASICVALUEFACTORY_H
-#include "clang/EntoSA/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
#include "clang/AST/ASTContext.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/APSInt.h"
diff --git a/include/clang/EntoSA/PathSensitive/BlockCounter.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/BlockCounter.h
similarity index 100%
rename from include/clang/EntoSA/PathSensitive/BlockCounter.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/BlockCounter.h
diff --git a/include/clang/EntoSA/PathSensitive/Checker.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/Checker.h
similarity index 99%
rename from include/clang/EntoSA/PathSensitive/Checker.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/Checker.h
index a536955..b2103a2 100644
--- a/include/clang/EntoSA/PathSensitive/Checker.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/Checker.h
@@ -16,7 +16,7 @@
#define LLVM_CLANG_GR_CHECKER
#include "clang/Analysis/Support/SaveAndRestore.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
//===----------------------------------------------------------------------===//
// Checker interface.
diff --git a/include/clang/EntoSA/PathSensitive/CheckerHelpers.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/CheckerHelpers.h
similarity index 100%
rename from include/clang/EntoSA/PathSensitive/CheckerHelpers.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/CheckerHelpers.h
diff --git a/include/clang/EntoSA/PathSensitive/CheckerVisitor.def b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/CheckerVisitor.def
similarity index 100%
rename from include/clang/EntoSA/PathSensitive/CheckerVisitor.def
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/CheckerVisitor.def
diff --git a/include/clang/EntoSA/PathSensitive/CheckerVisitor.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/CheckerVisitor.h
similarity index 92%
rename from include/clang/EntoSA/PathSensitive/CheckerVisitor.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/CheckerVisitor.h
index 62ce943..68677f5 100644
--- a/include/clang/EntoSA/PathSensitive/CheckerVisitor.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/CheckerVisitor.h
@@ -13,7 +13,7 @@
#ifndef LLVM_CLANG_GR_CHECKERVISITOR
#define LLVM_CLANG_GR_CHECKERVISITOR
-#include "clang/EntoSA/PathSensitive/Checker.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
namespace clang {
@@ -51,7 +51,7 @@
case Stmt::NAME ## Class:\
static_cast<ImplClass*>(this)->PreVisit ## NAME(C,static_cast<const NAME*>(S));\
break;
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.def"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.def"
}
}
@@ -70,7 +70,7 @@
static_cast<ImplClass*>(this)->\
PostVisit ## NAME(C,static_cast<const NAME*>(S));\
break;
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.def"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.def"
}
}
@@ -101,7 +101,7 @@
void PostVisit ## NAME(CheckerContext &C, const NAME* S) {\
static_cast<ImplClass*>(this)->PostVisit ## FALLBACK(C, S);\
}
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.def"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.def"
};
} // end GR namespace
diff --git a/include/clang/EntoSA/PathSensitive/ConstraintManager.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/ConstraintManager.h
similarity index 97%
rename from include/clang/EntoSA/PathSensitive/ConstraintManager.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/ConstraintManager.h
index b9e723c..81f4558 100644
--- a/include/clang/EntoSA/PathSensitive/ConstraintManager.h
+++ b/include/clang/StaticAnalyzer/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/EntoSA/PathSensitive/Store.h"
+#include "clang/StaticAnalyzer/PathSensitive/Store.h"
namespace llvm {
class APSInt;
diff --git a/include/clang/EntoSA/PathSensitive/CoreEngine.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/CoreEngine.h
similarity index 98%
rename from include/clang/EntoSA/PathSensitive/CoreEngine.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/CoreEngine.h
index 45e7fdc..3d63982 100644
--- a/include/clang/EntoSA/PathSensitive/CoreEngine.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/CoreEngine.h
@@ -16,10 +16,10 @@
#define LLVM_CLANG_GR_COREENGINE
#include "clang/AST/Expr.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 "clang/StaticAnalyzer/PathSensitive/ExplodedGraph.h"
+#include "clang/StaticAnalyzer/PathSensitive/WorkList.h"
+#include "clang/StaticAnalyzer/PathSensitive/BlockCounter.h"
+#include "clang/StaticAnalyzer/PathSensitive/SubEngine.h"
#include "llvm/ADT/OwningPtr.h"
namespace clang {
diff --git a/include/clang/EntoSA/PathSensitive/Environment.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/Environment.h
similarity index 96%
rename from include/clang/EntoSA/PathSensitive/Environment.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/Environment.h
index 1e88e16..8f2ebce 100644
--- a/include/clang/EntoSA/PathSensitive/Environment.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/Environment.h
@@ -14,8 +14,8 @@
#ifndef LLVM_CLANG_GR_ENVIRONMENT_H
#define LLVM_CLANG_GR_ENVIRONMENT_H
-#include "clang/EntoSA/PathSensitive/Store.h"
-#include "clang/EntoSA/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/Store.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
#include "llvm/ADT/ImmutableMap.h"
namespace clang {
diff --git a/include/clang/EntoSA/PathSensitive/ExplodedGraph.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/ExplodedGraph.h
similarity index 100%
rename from include/clang/EntoSA/PathSensitive/ExplodedGraph.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/ExplodedGraph.h
diff --git a/include/clang/EntoSA/PathSensitive/ExprEngine.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/ExprEngine.h
similarity index 98%
rename from include/clang/EntoSA/PathSensitive/ExprEngine.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/ExprEngine.h
index d10e76b..407691a 100644
--- a/include/clang/EntoSA/PathSensitive/ExprEngine.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/ExprEngine.h
@@ -16,12 +16,12 @@
#ifndef LLVM_CLANG_GR_EXPRENGINE
#define LLVM_CLANG_GR_EXPRENGINE
-#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/StaticAnalyzer/PathSensitive/AnalysisManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/SubEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/CoreEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/TransferFuncs.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include "clang/AST/Type.h"
#include "clang/AST/ExprObjC.h"
#include "clang/AST/ExprCXX.h"
diff --git a/include/clang/EntoSA/PathSensitive/ExprEngineBuilders.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/ExprEngineBuilders.h
similarity index 97%
rename from include/clang/EntoSA/PathSensitive/ExprEngineBuilders.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/ExprEngineBuilders.h
index 91df612..965ec3e 100644
--- a/include/clang/EntoSA/PathSensitive/ExprEngineBuilders.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/ExprEngineBuilders.h
@@ -14,7 +14,7 @@
#ifndef LLVM_CLANG_GR_EXPRENGINE_BUILDERS
#define LLVM_CLANG_GR_EXPRENGINE_BUILDERS
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
#include "clang/Analysis/Support/SaveAndRestore.h"
namespace clang {
diff --git a/include/clang/EntoSA/PathSensitive/GRState.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/GRState.h
similarity index 98%
rename from include/clang/EntoSA/PathSensitive/GRState.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/GRState.h
index 8e2ab07..dcdb6e2 100644
--- a/include/clang/EntoSA/PathSensitive/GRState.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/GRState.h
@@ -14,10 +14,10 @@
#ifndef LLVM_CLANG_GR_VALUESTATE_H
#define LLVM_CLANG_GR_VALUESTATE_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 "clang/StaticAnalyzer/PathSensitive/ConstraintManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/Environment.h"
+#include "clang/StaticAnalyzer/PathSensitive/Store.h"
+#include "clang/StaticAnalyzer/PathSensitive/SValBuilder.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/ImmutableMap.h"
#include "llvm/Support/Casting.h"
diff --git a/include/clang/EntoSA/PathSensitive/GRStateTrait.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/GRStateTrait.h
similarity index 100%
rename from include/clang/EntoSA/PathSensitive/GRStateTrait.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/GRStateTrait.h
diff --git a/include/clang/EntoSA/PathSensitive/MemRegion.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/MemRegion.h
similarity index 99%
rename from include/clang/EntoSA/PathSensitive/MemRegion.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/MemRegion.h
index c9c72ab..33779a9 100644
--- a/include/clang/EntoSA/PathSensitive/MemRegion.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/MemRegion.h
@@ -18,7 +18,7 @@
#include "clang/AST/Decl.h"
#include "clang/AST/DeclObjC.h"
-#include "clang/EntoSA/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
#include "llvm/Support/Casting.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/ADT/FoldingSet.h"
diff --git a/include/clang/EntoSA/PathSensitive/SValBuilder.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/SValBuilder.h
similarity index 97%
rename from include/clang/EntoSA/PathSensitive/SValBuilder.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/SValBuilder.h
index f4c168d..0705510 100644
--- a/include/clang/EntoSA/PathSensitive/SValBuilder.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/SValBuilder.h
@@ -17,9 +17,9 @@
#include "clang/AST/Expr.h"
#include "clang/AST/ExprCXX.h"
-#include "clang/EntoSA/PathSensitive/SVals.h"
-#include "clang/EntoSA/PathSensitive/BasicValueFactory.h"
-#include "clang/EntoSA/PathSensitive/MemRegion.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/BasicValueFactory.h"
+#include "clang/StaticAnalyzer/PathSensitive/MemRegion.h"
namespace clang {
diff --git a/include/clang/EntoSA/PathSensitive/SVals.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/SVals.h
similarity index 99%
rename from include/clang/EntoSA/PathSensitive/SVals.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/SVals.h
index acbf1d4..d4d8469 100644
--- a/include/clang/EntoSA/PathSensitive/SVals.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/SVals.h
@@ -15,7 +15,7 @@
#ifndef LLVM_CLANG_GR_RVALUE_H
#define LLVM_CLANG_GR_RVALUE_H
-#include "clang/EntoSA/PathSensitive/SymbolManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/SymbolManager.h"
#include "llvm/Support/Casting.h"
#include "llvm/ADT/ImmutableList.h"
diff --git a/include/clang/EntoSA/PathSensitive/Store.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/Store.h
similarity index 98%
rename from include/clang/EntoSA/PathSensitive/Store.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/Store.h
index 83b1138..c48f129 100644
--- a/include/clang/EntoSA/PathSensitive/Store.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/Store.h
@@ -14,8 +14,8 @@
#ifndef LLVM_CLANG_GR_STORE_H
#define LLVM_CLANG_GR_STORE_H
-#include "clang/EntoSA/PathSensitive/MemRegion.h"
-#include "clang/EntoSA/PathSensitive/SValBuilder.h"
+#include "clang/StaticAnalyzer/PathSensitive/MemRegion.h"
+#include "clang/StaticAnalyzer/PathSensitive/SValBuilder.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/Optional.h"
diff --git a/include/clang/EntoSA/PathSensitive/SubEngine.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/SubEngine.h
similarity index 98%
rename from include/clang/EntoSA/PathSensitive/SubEngine.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/SubEngine.h
index bddd5e9..8672bd1 100644
--- a/include/clang/EntoSA/PathSensitive/SubEngine.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/SubEngine.h
@@ -13,7 +13,7 @@
#ifndef LLVM_CLANG_GR_SUBENGINE_H
#define LLVM_CLANG_GR_SUBENGINE_H
-#include "clang/EntoSA/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
namespace clang {
diff --git a/include/clang/EntoSA/PathSensitive/SummaryManager.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/SummaryManager.h
similarity index 100%
rename from include/clang/EntoSA/PathSensitive/SummaryManager.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/SummaryManager.h
diff --git a/include/clang/EntoSA/PathSensitive/SymbolManager.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/SymbolManager.h
similarity index 100%
rename from include/clang/EntoSA/PathSensitive/SymbolManager.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/SymbolManager.h
diff --git a/include/clang/EntoSA/PathSensitive/TransferFuncs.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/TransferFuncs.h
similarity index 95%
rename from include/clang/EntoSA/PathSensitive/TransferFuncs.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/TransferFuncs.h
index ac5b4a6..22e3a4d 100644
--- a/include/clang/EntoSA/PathSensitive/TransferFuncs.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/TransferFuncs.h
@@ -15,8 +15,8 @@
#ifndef LLVM_CLANG_GR_TRANSFERFUNCS
#define LLVM_CLANG_GR_TRANSFERFUNCS
-#include "clang/EntoSA/PathSensitive/GRState.h"
-#include "clang/EntoSA/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
#include <vector>
namespace clang {
diff --git a/include/clang/EntoSA/PathSensitive/WorkList.h b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/WorkList.h
similarity index 97%
rename from include/clang/EntoSA/PathSensitive/WorkList.h
rename to include/clang/StaticAnalyzer/EntoSA/PathSensitive/WorkList.h
index 6f98587..be90906 100644
--- a/include/clang/EntoSA/PathSensitive/WorkList.h
+++ b/include/clang/StaticAnalyzer/EntoSA/PathSensitive/WorkList.h
@@ -15,7 +15,7 @@
#ifndef LLVM_CLANG_GR_WORKLIST
#define LLVM_CLANG_GR_WORKLIST
-#include "clang/EntoSA/PathSensitive/BlockCounter.h"
+#include "clang/StaticAnalyzer/PathSensitive/BlockCounter.h"
#include <cstddef>
namespace clang {
diff --git a/include/clang/EntoSA/FrontendActions.h b/include/clang/StaticAnalyzer/FrontendActions.h
similarity index 100%
copy from include/clang/EntoSA/FrontendActions.h
copy to include/clang/StaticAnalyzer/FrontendActions.h
diff --git a/include/clang/EntoSA/ManagerRegistry.h b/include/clang/StaticAnalyzer/ManagerRegistry.h
similarity index 96%
copy from include/clang/EntoSA/ManagerRegistry.h
copy to include/clang/StaticAnalyzer/ManagerRegistry.h
index 43657a5..1b84980 100644
--- a/include/clang/EntoSA/ManagerRegistry.h
+++ b/include/clang/StaticAnalyzer/ManagerRegistry.h
@@ -14,7 +14,7 @@
#ifndef LLVM_CLANG_GR_MANAGER_REGISTRY_H
#define LLVM_CLANG_GR_MANAGER_REGISTRY_H
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
namespace clang {
diff --git a/include/clang/EntoSA/PathDiagnosticClients.h b/include/clang/StaticAnalyzer/PathDiagnosticClients.h
similarity index 100%
copy from include/clang/EntoSA/PathDiagnosticClients.h
copy to include/clang/StaticAnalyzer/PathDiagnosticClients.h
diff --git a/include/clang/EntoSA/PathSensitive/AnalysisManager.h b/include/clang/StaticAnalyzer/PathSensitive/AnalysisManager.h
similarity index 97%
copy from include/clang/EntoSA/PathSensitive/AnalysisManager.h
copy to include/clang/StaticAnalyzer/PathSensitive/AnalysisManager.h
index 95d954e..ba86ed8 100644
--- a/include/clang/EntoSA/PathSensitive/AnalysisManager.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/AnalysisManager.h
@@ -16,8 +16,8 @@
#define LLVM_CLANG_GR_ANALYSISMANAGER_H
#include "clang/Analysis/AnalysisContext.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
namespace clang {
diff --git a/include/clang/EntoSA/PathSensitive/BasicValueFactory.h b/include/clang/StaticAnalyzer/PathSensitive/BasicValueFactory.h
similarity index 98%
copy from include/clang/EntoSA/PathSensitive/BasicValueFactory.h
copy to include/clang/StaticAnalyzer/PathSensitive/BasicValueFactory.h
index 061508e..4cac8b6 100644
--- a/include/clang/EntoSA/PathSensitive/BasicValueFactory.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/BasicValueFactory.h
@@ -16,7 +16,7 @@
#ifndef LLVM_CLANG_GR_BASICVALUEFACTORY_H
#define LLVM_CLANG_GR_BASICVALUEFACTORY_H
-#include "clang/EntoSA/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
#include "clang/AST/ASTContext.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/APSInt.h"
diff --git a/include/clang/EntoSA/PathSensitive/BlockCounter.h b/include/clang/StaticAnalyzer/PathSensitive/BlockCounter.h
similarity index 100%
copy from include/clang/EntoSA/PathSensitive/BlockCounter.h
copy to include/clang/StaticAnalyzer/PathSensitive/BlockCounter.h
diff --git a/include/clang/EntoSA/PathSensitive/Checker.h b/include/clang/StaticAnalyzer/PathSensitive/Checker.h
similarity index 99%
copy from include/clang/EntoSA/PathSensitive/Checker.h
copy to include/clang/StaticAnalyzer/PathSensitive/Checker.h
index a536955..b2103a2 100644
--- a/include/clang/EntoSA/PathSensitive/Checker.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/Checker.h
@@ -16,7 +16,7 @@
#define LLVM_CLANG_GR_CHECKER
#include "clang/Analysis/Support/SaveAndRestore.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
//===----------------------------------------------------------------------===//
// Checker interface.
diff --git a/include/clang/EntoSA/PathSensitive/CheckerHelpers.h b/include/clang/StaticAnalyzer/PathSensitive/CheckerHelpers.h
similarity index 100%
copy from include/clang/EntoSA/PathSensitive/CheckerHelpers.h
copy to include/clang/StaticAnalyzer/PathSensitive/CheckerHelpers.h
diff --git a/include/clang/EntoSA/PathSensitive/CheckerVisitor.def b/include/clang/StaticAnalyzer/PathSensitive/CheckerVisitor.def
similarity index 100%
copy from include/clang/EntoSA/PathSensitive/CheckerVisitor.def
copy to include/clang/StaticAnalyzer/PathSensitive/CheckerVisitor.def
diff --git a/include/clang/EntoSA/PathSensitive/CheckerVisitor.h b/include/clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h
similarity index 92%
copy from include/clang/EntoSA/PathSensitive/CheckerVisitor.h
copy to include/clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h
index 62ce943..68677f5 100644
--- a/include/clang/EntoSA/PathSensitive/CheckerVisitor.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h
@@ -13,7 +13,7 @@
#ifndef LLVM_CLANG_GR_CHECKERVISITOR
#define LLVM_CLANG_GR_CHECKERVISITOR
-#include "clang/EntoSA/PathSensitive/Checker.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
namespace clang {
@@ -51,7 +51,7 @@
case Stmt::NAME ## Class:\
static_cast<ImplClass*>(this)->PreVisit ## NAME(C,static_cast<const NAME*>(S));\
break;
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.def"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.def"
}
}
@@ -70,7 +70,7 @@
static_cast<ImplClass*>(this)->\
PostVisit ## NAME(C,static_cast<const NAME*>(S));\
break;
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.def"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.def"
}
}
@@ -101,7 +101,7 @@
void PostVisit ## NAME(CheckerContext &C, const NAME* S) {\
static_cast<ImplClass*>(this)->PostVisit ## FALLBACK(C, S);\
}
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.def"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.def"
};
} // end GR namespace
diff --git a/include/clang/EntoSA/PathSensitive/ConstraintManager.h b/include/clang/StaticAnalyzer/PathSensitive/ConstraintManager.h
similarity index 97%
copy from include/clang/EntoSA/PathSensitive/ConstraintManager.h
copy to include/clang/StaticAnalyzer/PathSensitive/ConstraintManager.h
index b9e723c..81f4558 100644
--- a/include/clang/EntoSA/PathSensitive/ConstraintManager.h
+++ b/include/clang/StaticAnalyzer/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/EntoSA/PathSensitive/Store.h"
+#include "clang/StaticAnalyzer/PathSensitive/Store.h"
namespace llvm {
class APSInt;
diff --git a/include/clang/EntoSA/PathSensitive/CoreEngine.h b/include/clang/StaticAnalyzer/PathSensitive/CoreEngine.h
similarity index 98%
copy from include/clang/EntoSA/PathSensitive/CoreEngine.h
copy to include/clang/StaticAnalyzer/PathSensitive/CoreEngine.h
index 45e7fdc..3d63982 100644
--- a/include/clang/EntoSA/PathSensitive/CoreEngine.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/CoreEngine.h
@@ -16,10 +16,10 @@
#define LLVM_CLANG_GR_COREENGINE
#include "clang/AST/Expr.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 "clang/StaticAnalyzer/PathSensitive/ExplodedGraph.h"
+#include "clang/StaticAnalyzer/PathSensitive/WorkList.h"
+#include "clang/StaticAnalyzer/PathSensitive/BlockCounter.h"
+#include "clang/StaticAnalyzer/PathSensitive/SubEngine.h"
#include "llvm/ADT/OwningPtr.h"
namespace clang {
diff --git a/include/clang/EntoSA/PathSensitive/Environment.h b/include/clang/StaticAnalyzer/PathSensitive/Environment.h
similarity index 96%
copy from include/clang/EntoSA/PathSensitive/Environment.h
copy to include/clang/StaticAnalyzer/PathSensitive/Environment.h
index 1e88e16..8f2ebce 100644
--- a/include/clang/EntoSA/PathSensitive/Environment.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/Environment.h
@@ -14,8 +14,8 @@
#ifndef LLVM_CLANG_GR_ENVIRONMENT_H
#define LLVM_CLANG_GR_ENVIRONMENT_H
-#include "clang/EntoSA/PathSensitive/Store.h"
-#include "clang/EntoSA/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/Store.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
#include "llvm/ADT/ImmutableMap.h"
namespace clang {
diff --git a/include/clang/EntoSA/PathSensitive/ExplodedGraph.h b/include/clang/StaticAnalyzer/PathSensitive/ExplodedGraph.h
similarity index 100%
copy from include/clang/EntoSA/PathSensitive/ExplodedGraph.h
copy to include/clang/StaticAnalyzer/PathSensitive/ExplodedGraph.h
diff --git a/include/clang/EntoSA/PathSensitive/ExprEngine.h b/include/clang/StaticAnalyzer/PathSensitive/ExprEngine.h
similarity index 98%
copy from include/clang/EntoSA/PathSensitive/ExprEngine.h
copy to include/clang/StaticAnalyzer/PathSensitive/ExprEngine.h
index d10e76b..407691a 100644
--- a/include/clang/EntoSA/PathSensitive/ExprEngine.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/ExprEngine.h
@@ -16,12 +16,12 @@
#ifndef LLVM_CLANG_GR_EXPRENGINE
#define LLVM_CLANG_GR_EXPRENGINE
-#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/StaticAnalyzer/PathSensitive/AnalysisManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/SubEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/CoreEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/TransferFuncs.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include "clang/AST/Type.h"
#include "clang/AST/ExprObjC.h"
#include "clang/AST/ExprCXX.h"
diff --git a/include/clang/EntoSA/PathSensitive/ExprEngineBuilders.h b/include/clang/StaticAnalyzer/PathSensitive/ExprEngineBuilders.h
similarity index 97%
copy from include/clang/EntoSA/PathSensitive/ExprEngineBuilders.h
copy to include/clang/StaticAnalyzer/PathSensitive/ExprEngineBuilders.h
index 91df612..965ec3e 100644
--- a/include/clang/EntoSA/PathSensitive/ExprEngineBuilders.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/ExprEngineBuilders.h
@@ -14,7 +14,7 @@
#ifndef LLVM_CLANG_GR_EXPRENGINE_BUILDERS
#define LLVM_CLANG_GR_EXPRENGINE_BUILDERS
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
#include "clang/Analysis/Support/SaveAndRestore.h"
namespace clang {
diff --git a/include/clang/EntoSA/PathSensitive/GRState.h b/include/clang/StaticAnalyzer/PathSensitive/GRState.h
similarity index 98%
copy from include/clang/EntoSA/PathSensitive/GRState.h
copy to include/clang/StaticAnalyzer/PathSensitive/GRState.h
index 8e2ab07..dcdb6e2 100644
--- a/include/clang/EntoSA/PathSensitive/GRState.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/GRState.h
@@ -14,10 +14,10 @@
#ifndef LLVM_CLANG_GR_VALUESTATE_H
#define LLVM_CLANG_GR_VALUESTATE_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 "clang/StaticAnalyzer/PathSensitive/ConstraintManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/Environment.h"
+#include "clang/StaticAnalyzer/PathSensitive/Store.h"
+#include "clang/StaticAnalyzer/PathSensitive/SValBuilder.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/ImmutableMap.h"
#include "llvm/Support/Casting.h"
diff --git a/include/clang/EntoSA/PathSensitive/GRStateTrait.h b/include/clang/StaticAnalyzer/PathSensitive/GRStateTrait.h
similarity index 100%
copy from include/clang/EntoSA/PathSensitive/GRStateTrait.h
copy to include/clang/StaticAnalyzer/PathSensitive/GRStateTrait.h
diff --git a/include/clang/EntoSA/PathSensitive/MemRegion.h b/include/clang/StaticAnalyzer/PathSensitive/MemRegion.h
similarity index 99%
copy from include/clang/EntoSA/PathSensitive/MemRegion.h
copy to include/clang/StaticAnalyzer/PathSensitive/MemRegion.h
index c9c72ab..33779a9 100644
--- a/include/clang/EntoSA/PathSensitive/MemRegion.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/MemRegion.h
@@ -18,7 +18,7 @@
#include "clang/AST/Decl.h"
#include "clang/AST/DeclObjC.h"
-#include "clang/EntoSA/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
#include "llvm/Support/Casting.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/ADT/FoldingSet.h"
diff --git a/include/clang/EntoSA/PathSensitive/SValBuilder.h b/include/clang/StaticAnalyzer/PathSensitive/SValBuilder.h
similarity index 97%
copy from include/clang/EntoSA/PathSensitive/SValBuilder.h
copy to include/clang/StaticAnalyzer/PathSensitive/SValBuilder.h
index f4c168d..0705510 100644
--- a/include/clang/EntoSA/PathSensitive/SValBuilder.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/SValBuilder.h
@@ -17,9 +17,9 @@
#include "clang/AST/Expr.h"
#include "clang/AST/ExprCXX.h"
-#include "clang/EntoSA/PathSensitive/SVals.h"
-#include "clang/EntoSA/PathSensitive/BasicValueFactory.h"
-#include "clang/EntoSA/PathSensitive/MemRegion.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/BasicValueFactory.h"
+#include "clang/StaticAnalyzer/PathSensitive/MemRegion.h"
namespace clang {
diff --git a/include/clang/EntoSA/PathSensitive/SVals.h b/include/clang/StaticAnalyzer/PathSensitive/SVals.h
similarity index 99%
copy from include/clang/EntoSA/PathSensitive/SVals.h
copy to include/clang/StaticAnalyzer/PathSensitive/SVals.h
index acbf1d4..d4d8469 100644
--- a/include/clang/EntoSA/PathSensitive/SVals.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/SVals.h
@@ -15,7 +15,7 @@
#ifndef LLVM_CLANG_GR_RVALUE_H
#define LLVM_CLANG_GR_RVALUE_H
-#include "clang/EntoSA/PathSensitive/SymbolManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/SymbolManager.h"
#include "llvm/Support/Casting.h"
#include "llvm/ADT/ImmutableList.h"
diff --git a/include/clang/EntoSA/PathSensitive/Store.h b/include/clang/StaticAnalyzer/PathSensitive/Store.h
similarity index 98%
copy from include/clang/EntoSA/PathSensitive/Store.h
copy to include/clang/StaticAnalyzer/PathSensitive/Store.h
index 83b1138..c48f129 100644
--- a/include/clang/EntoSA/PathSensitive/Store.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/Store.h
@@ -14,8 +14,8 @@
#ifndef LLVM_CLANG_GR_STORE_H
#define LLVM_CLANG_GR_STORE_H
-#include "clang/EntoSA/PathSensitive/MemRegion.h"
-#include "clang/EntoSA/PathSensitive/SValBuilder.h"
+#include "clang/StaticAnalyzer/PathSensitive/MemRegion.h"
+#include "clang/StaticAnalyzer/PathSensitive/SValBuilder.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/Optional.h"
diff --git a/include/clang/EntoSA/PathSensitive/SubEngine.h b/include/clang/StaticAnalyzer/PathSensitive/SubEngine.h
similarity index 98%
copy from include/clang/EntoSA/PathSensitive/SubEngine.h
copy to include/clang/StaticAnalyzer/PathSensitive/SubEngine.h
index bddd5e9..8672bd1 100644
--- a/include/clang/EntoSA/PathSensitive/SubEngine.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/SubEngine.h
@@ -13,7 +13,7 @@
#ifndef LLVM_CLANG_GR_SUBENGINE_H
#define LLVM_CLANG_GR_SUBENGINE_H
-#include "clang/EntoSA/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
namespace clang {
diff --git a/include/clang/EntoSA/PathSensitive/SummaryManager.h b/include/clang/StaticAnalyzer/PathSensitive/SummaryManager.h
similarity index 100%
copy from include/clang/EntoSA/PathSensitive/SummaryManager.h
copy to include/clang/StaticAnalyzer/PathSensitive/SummaryManager.h
diff --git a/include/clang/EntoSA/PathSensitive/SymbolManager.h b/include/clang/StaticAnalyzer/PathSensitive/SymbolManager.h
similarity index 100%
copy from include/clang/EntoSA/PathSensitive/SymbolManager.h
copy to include/clang/StaticAnalyzer/PathSensitive/SymbolManager.h
diff --git a/include/clang/EntoSA/PathSensitive/TransferFuncs.h b/include/clang/StaticAnalyzer/PathSensitive/TransferFuncs.h
similarity index 95%
copy from include/clang/EntoSA/PathSensitive/TransferFuncs.h
copy to include/clang/StaticAnalyzer/PathSensitive/TransferFuncs.h
index ac5b4a6..22e3a4d 100644
--- a/include/clang/EntoSA/PathSensitive/TransferFuncs.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/TransferFuncs.h
@@ -15,8 +15,8 @@
#ifndef LLVM_CLANG_GR_TRANSFERFUNCS
#define LLVM_CLANG_GR_TRANSFERFUNCS
-#include "clang/EntoSA/PathSensitive/GRState.h"
-#include "clang/EntoSA/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
#include <vector>
namespace clang {
diff --git a/include/clang/EntoSA/PathSensitive/WorkList.h b/include/clang/StaticAnalyzer/PathSensitive/WorkList.h
similarity index 97%
copy from include/clang/EntoSA/PathSensitive/WorkList.h
copy to include/clang/StaticAnalyzer/PathSensitive/WorkList.h
index 6f98587..be90906 100644
--- a/include/clang/EntoSA/PathSensitive/WorkList.h
+++ b/include/clang/StaticAnalyzer/PathSensitive/WorkList.h
@@ -15,7 +15,7 @@
#ifndef LLVM_CLANG_GR_WORKLIST
#define LLVM_CLANG_GR_WORKLIST
-#include "clang/EntoSA/PathSensitive/BlockCounter.h"
+#include "clang/StaticAnalyzer/PathSensitive/BlockCounter.h"
#include <cstddef>
namespace clang {
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 6197dc7..a75dd22 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -12,5 +12,5 @@
add_subdirectory(Frontend)
add_subdirectory(FrontendTool)
add_subdirectory(Index)
-add_subdirectory(EntoSA)
-add_subdirectory(EntoSA/Checkers)
+add_subdirectory(StaticAnalyzer)
+add_subdirectory(StaticAnalyzer/Checkers)
diff --git a/lib/FrontendTool/CMakeLists.txt b/lib/FrontendTool/CMakeLists.txt
index 89937e1..31983df 100644
--- a/lib/FrontendTool/CMakeLists.txt
+++ b/lib/FrontendTool/CMakeLists.txt
@@ -1,7 +1,7 @@
set(LLVM_NO_RTTI 1)
set(LLVM_USED_LIBS clangDriver clangFrontend clangRewrite clangCodeGen
- clangEntoCheckers clangEntoCore)
+ clangStaticAnalyzerCheckers clangStaticAnalyzerCore)
add_clang_library(clangFrontendTool
ExecuteCompilerInvocation.cpp
diff --git a/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/lib/FrontendTool/ExecuteCompilerInvocation.cpp
index e17e8b7..6278975 100644
--- a/lib/FrontendTool/ExecuteCompilerInvocation.cpp
+++ b/lib/FrontendTool/ExecuteCompilerInvocation.cpp
@@ -13,7 +13,7 @@
//===----------------------------------------------------------------------===//
#include "clang/FrontendTool/Utils.h"
-#include "clang/EntoSA/FrontendActions.h"
+#include "clang/StaticAnalyzer/FrontendActions.h"
#include "clang/CodeGen/CodeGenAction.h"
#include "clang/Driver/CC1Options.h"
#include "clang/Driver/OptTable.h"
diff --git a/lib/Makefile b/lib/Makefile
index 300b9ea..bf357fc 100755
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -9,7 +9,7 @@
CLANG_LEVEL := ..
PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis \
- EntoSA Rewrite Serialization Frontend FrontendTool Index Driver
+ StaticAnalyzer Rewrite Serialization Frontend FrontendTool Index Driver
include $(CLANG_LEVEL)/Makefile
diff --git a/lib/EntoSA/AggExprVisitor.cpp b/lib/StaticAnalyzer/AggExprVisitor.cpp
similarity index 96%
rename from lib/EntoSA/AggExprVisitor.cpp
rename to lib/StaticAnalyzer/AggExprVisitor.cpp
index c356186..0cc2390 100644
--- a/lib/EntoSA/AggExprVisitor.cpp
+++ b/lib/StaticAnalyzer/AggExprVisitor.cpp
@@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
#include "clang/AST/StmtVisitor.h"
using namespace clang;
diff --git a/lib/EntoSA/AnalysisManager.cpp b/lib/StaticAnalyzer/AnalysisManager.cpp
similarity index 93%
rename from lib/EntoSA/AnalysisManager.cpp
rename to lib/StaticAnalyzer/AnalysisManager.cpp
index fa64f47..cc5e271 100644
--- a/lib/EntoSA/AnalysisManager.cpp
+++ b/lib/StaticAnalyzer/AnalysisManager.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/AnalysisManager.h"
#include "clang/Index/Entity.h"
#include "clang/Index/Indexer.h"
diff --git a/lib/EntoSA/AnalyzerStatsChecker.cpp b/lib/StaticAnalyzer/AnalyzerStatsChecker.cpp
similarity index 95%
rename from lib/EntoSA/AnalyzerStatsChecker.cpp
rename to lib/StaticAnalyzer/AnalyzerStatsChecker.cpp
index fb0e74b..8521c18 100644
--- a/lib/EntoSA/AnalyzerStatsChecker.cpp
+++ b/lib/StaticAnalyzer/AnalyzerStatsChecker.cpp
@@ -9,9 +9,9 @@
// This file reports various statistics about analyzer visitation.
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExplodedGraph.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
// FIXME: Restructure checker registration.
#include "Checkers/ExprEngineExperimentalChecks.h"
diff --git a/lib/EntoSA/BasicConstraintManager.cpp b/lib/StaticAnalyzer/BasicConstraintManager.cpp
similarity index 98%
rename from lib/EntoSA/BasicConstraintManager.cpp
rename to lib/StaticAnalyzer/BasicConstraintManager.cpp
index 92837d2..8bdc4fa 100644
--- a/lib/EntoSA/BasicConstraintManager.cpp
+++ b/lib/StaticAnalyzer/BasicConstraintManager.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "SimpleConstraintManager.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
-#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
-#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/TransferFuncs.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/lib/EntoSA/BasicStore.cpp b/lib/StaticAnalyzer/BasicStore.cpp
similarity index 99%
rename from lib/EntoSA/BasicStore.cpp
rename to lib/StaticAnalyzer/BasicStore.cpp
index 8c4a732..35bcf94 100644
--- a/lib/EntoSA/BasicStore.cpp
+++ b/lib/StaticAnalyzer/BasicStore.cpp
@@ -15,7 +15,7 @@
#include "clang/AST/ExprObjC.h"
#include "clang/Analysis/Analyses/LiveVariables.h"
#include "clang/Analysis/AnalysisContext.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
diff --git a/lib/EntoSA/BasicValueFactory.cpp b/lib/StaticAnalyzer/BasicValueFactory.cpp
similarity index 98%
rename from lib/EntoSA/BasicValueFactory.cpp
rename to lib/StaticAnalyzer/BasicValueFactory.cpp
index 0d1cb4a..d8b501b 100644
--- a/lib/EntoSA/BasicValueFactory.cpp
+++ b/lib/StaticAnalyzer/BasicValueFactory.cpp
@@ -13,7 +13,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/BasicValueFactory.h"
+#include "clang/StaticAnalyzer/PathSensitive/BasicValueFactory.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/BlockCounter.cpp b/lib/StaticAnalyzer/BlockCounter.cpp
similarity index 97%
rename from lib/EntoSA/BlockCounter.cpp
rename to lib/StaticAnalyzer/BlockCounter.cpp
index b4e6eee..47f6088 100644
--- a/lib/EntoSA/BlockCounter.cpp
+++ b/lib/StaticAnalyzer/BlockCounter.cpp
@@ -13,7 +13,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/BlockCounter.h"
+#include "clang/StaticAnalyzer/PathSensitive/BlockCounter.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
diff --git a/lib/EntoSA/BugReporter.cpp b/lib/StaticAnalyzer/BugReporter.cpp
similarity index 99%
rename from lib/EntoSA/BugReporter.cpp
rename to lib/StaticAnalyzer/BugReporter.cpp
index ff35024..8edbe14 100644
--- a/lib/EntoSA/BugReporter.cpp
+++ b/lib/StaticAnalyzer/BugReporter.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/BugReporter/BugReporter.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/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/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/STLExtras.h"
diff --git a/lib/EntoSA/BugReporterVisitors.cpp b/lib/StaticAnalyzer/BugReporterVisitors.cpp
similarity index 97%
rename from lib/EntoSA/BugReporterVisitors.cpp
rename to lib/StaticAnalyzer/BugReporterVisitors.cpp
index d264505..91d7275 100644
--- a/lib/EntoSA/BugReporterVisitors.cpp
+++ b/lib/StaticAnalyzer/BugReporterVisitors.cpp
@@ -14,10 +14,10 @@
#include "clang/AST/Expr.h"
#include "clang/AST/ExprObjC.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"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExplodedGraph.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/CFRefCount.cpp b/lib/StaticAnalyzer/CFRefCount.cpp
similarity index 99%
rename from lib/EntoSA/CFRefCount.cpp
rename to lib/StaticAnalyzer/CFRefCount.cpp
index 9c9637e..5fd223c 100644
--- a/lib/EntoSA/CFRefCount.cpp
+++ b/lib/StaticAnalyzer/CFRefCount.cpp
@@ -16,15 +16,15 @@
#include "clang/AST/StmtVisitor.h"
#include "clang/Basic/LangOptions.h"
#include "clang/Basic/SourceManager.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
#include "clang/Analysis/DomainSpecific/CocoaConventions.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 "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngineBuilders.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/TransferFuncs.h"
+#include "clang/StaticAnalyzer/PathSensitive/SymbolManager.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/ImmutableList.h"
diff --git a/lib/EntoSA/CMakeLists.txt b/lib/StaticAnalyzer/CMakeLists.txt
similarity index 85%
rename from lib/EntoSA/CMakeLists.txt
rename to lib/StaticAnalyzer/CMakeLists.txt
index 09a6c2f..cf81e1d 100644
--- a/lib/EntoSA/CMakeLists.txt
+++ b/lib/StaticAnalyzer/CMakeLists.txt
@@ -2,7 +2,7 @@
set(LLVM_USED_LIBS clangBasic clangLex clangAST clangFrontend clangRewrite)
-add_clang_library(clangEntoCore
+add_clang_library(clangStaticAnalyzerCore
AggExprVisitor.cpp
AnalysisManager.cpp
AnalyzerStatsChecker.cpp
@@ -37,5 +37,5 @@
TextPathDiagnostics.cpp
)
-add_dependencies(clangEntoCore ClangAttrClasses ClangAttrList ClangDeclNodes
+add_dependencies(clangStaticAnalyzerCore ClangAttrClasses ClangAttrList ClangDeclNodes
ClangStmtNodes)
diff --git a/lib/EntoSA/CXXExprEngine.cpp b/lib/StaticAnalyzer/CXXExprEngine.cpp
similarity index 98%
rename from lib/EntoSA/CXXExprEngine.cpp
rename to lib/StaticAnalyzer/CXXExprEngine.cpp
index 3ecd439..47b3a0b 100644
--- a/lib/EntoSA/CXXExprEngine.cpp
+++ b/lib/StaticAnalyzer/CXXExprEngine.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/AnalysisManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
#include "clang/AST/DeclCXX.h"
using namespace clang;
diff --git a/lib/EntoSA/Checker.cpp b/lib/StaticAnalyzer/Checker.cpp
similarity index 95%
rename from lib/EntoSA/Checker.cpp
rename to lib/StaticAnalyzer/Checker.cpp
index 943be6b..6867ff5 100644
--- a/lib/EntoSA/Checker.cpp
+++ b/lib/StaticAnalyzer/Checker.cpp
@@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/Checker.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/CheckerHelpers.cpp b/lib/StaticAnalyzer/CheckerHelpers.cpp
similarity index 96%
rename from lib/EntoSA/CheckerHelpers.cpp
rename to lib/StaticAnalyzer/CheckerHelpers.cpp
index 7c7f707..be9fee5 100644
--- a/lib/EntoSA/CheckerHelpers.cpp
+++ b/lib/StaticAnalyzer/CheckerHelpers.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/CheckerHelpers.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerHelpers.h"
#include "clang/AST/Expr.h"
// Recursively find any substatements containing macros
diff --git a/lib/EntoSA/Checkers/AdjustedReturnValueChecker.cpp b/lib/StaticAnalyzer/Checkers/AdjustedReturnValueChecker.cpp
similarity index 93%
rename from lib/EntoSA/Checkers/AdjustedReturnValueChecker.cpp
rename to lib/StaticAnalyzer/Checkers/AdjustedReturnValueChecker.cpp
index 914b1e4..46e2de5 100644
--- a/lib/EntoSA/Checkers/AdjustedReturnValueChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/AdjustedReturnValueChecker.cpp
@@ -14,9 +14,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/AnalysisConsumer.cpp b/lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp
similarity index 97%
rename from lib/EntoSA/Checkers/AnalysisConsumer.cpp
rename to lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp
index 043a24a..ee4eae2 100644
--- a/lib/EntoSA/Checkers/AnalysisConsumer.cpp
+++ b/lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/AnalysisConsumer.h"
+#include "clang/StaticAnalyzer/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/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"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/ManagerRegistry.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/PathSensitive/AnalysisManager.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/TransferFuncs.h"
+#include "clang/StaticAnalyzer/PathDiagnosticClients.h"
// FIXME: Restructure checker registration.
#include "ExprEngineExperimentalChecks.h"
diff --git a/lib/EntoSA/Checkers/ArrayBoundChecker.cpp b/lib/StaticAnalyzer/Checkers/ArrayBoundChecker.cpp
similarity index 93%
rename from lib/EntoSA/Checkers/ArrayBoundChecker.cpp
rename to lib/StaticAnalyzer/Checkers/ArrayBoundChecker.cpp
index c72a466..13e628b 100644
--- a/lib/EntoSA/Checkers/ArrayBoundChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/ArrayBoundChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/ArrayBoundCheckerV2.cpp b/lib/StaticAnalyzer/Checkers/ArrayBoundCheckerV2.cpp
similarity index 97%
rename from lib/EntoSA/Checkers/ArrayBoundCheckerV2.cpp
rename to lib/StaticAnalyzer/Checkers/ArrayBoundCheckerV2.cpp
index 33683ba..b55fade 100644
--- a/lib/EntoSA/Checkers/ArrayBoundCheckerV2.cpp
+++ b/lib/StaticAnalyzer/Checkers/ArrayBoundCheckerV2.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
#include "clang/AST/CharUnits.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/AttrNonNullChecker.cpp b/lib/StaticAnalyzer/Checkers/AttrNonNullChecker.cpp
similarity index 96%
rename from lib/EntoSA/Checkers/AttrNonNullChecker.cpp
rename to lib/StaticAnalyzer/Checkers/AttrNonNullChecker.cpp
index f887e24..646b30b 100644
--- a/lib/EntoSA/Checkers/AttrNonNullChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/AttrNonNullChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/BasicObjCFoundationChecks.cpp b/lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp
similarity index 96%
rename from lib/EntoSA/Checkers/BasicObjCFoundationChecks.cpp
rename to lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp
index 8e83160..b4e2959 100644
--- a/lib/EntoSA/Checkers/BasicObjCFoundationChecks.cpp
+++ b/lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.cpp
@@ -15,14 +15,14 @@
#include "BasicObjCFoundationChecks.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/StaticAnalyzer/PathSensitive/ExplodedGraph.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/MemRegion.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
#include "clang/AST/DeclObjC.h"
#include "clang/AST/Expr.h"
#include "clang/AST/ExprObjC.h"
diff --git a/lib/EntoSA/Checkers/BasicObjCFoundationChecks.h b/lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.h
similarity index 100%
copy from lib/EntoSA/Checkers/BasicObjCFoundationChecks.h
copy to lib/StaticAnalyzer/Checkers/BasicObjCFoundationChecks.h
diff --git a/lib/EntoSA/Checkers/BuiltinFunctionChecker.cpp b/lib/StaticAnalyzer/Checkers/BuiltinFunctionChecker.cpp
similarity index 97%
rename from lib/EntoSA/Checkers/BuiltinFunctionChecker.cpp
rename to lib/StaticAnalyzer/Checkers/BuiltinFunctionChecker.cpp
index 1db8aac..2e6f1b9 100644
--- a/lib/EntoSA/Checkers/BuiltinFunctionChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/BuiltinFunctionChecker.cpp
@@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/PathSensitive/Checker.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
#include "clang/Basic/Builtins.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/CMakeLists.txt b/lib/StaticAnalyzer/Checkers/CMakeLists.txt
similarity index 90%
rename from lib/EntoSA/Checkers/CMakeLists.txt
rename to lib/StaticAnalyzer/Checkers/CMakeLists.txt
index 224a515..e4b9541 100644
--- a/lib/EntoSA/Checkers/CMakeLists.txt
+++ b/lib/StaticAnalyzer/Checkers/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_clang_library(clangEntoCheckers
+add_clang_library(clangStaticAnalyzerCheckers
AdjustedReturnValueChecker.cpp
AnalysisConsumer.cpp
ArrayBoundChecker.cpp
@@ -49,5 +49,5 @@
VLASizeChecker.cpp
)
-add_dependencies(clangEntoCore ClangAttrClasses ClangAttrList ClangDeclNodes
+add_dependencies(clangStaticAnalyzerCore ClangAttrClasses ClangAttrList ClangDeclNodes
ClangStmtNodes)
diff --git a/lib/EntoSA/Checkers/CStringChecker.cpp b/lib/StaticAnalyzer/Checkers/CStringChecker.cpp
similarity index 99%
rename from lib/EntoSA/Checkers/CStringChecker.cpp
rename to lib/StaticAnalyzer/Checkers/CStringChecker.cpp
index 199d6b2..b7513c3 100644
--- a/lib/EntoSA/Checkers/CStringChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/CStringChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineExperimentalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
#include "llvm/ADT/StringSwitch.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/CallAndMessageChecker.cpp b/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
similarity index 98%
rename from lib/EntoSA/Checkers/CallAndMessageChecker.cpp
rename to lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
index 2fa37e3..2998406 100644
--- a/lib/EntoSA/Checkers/CallAndMessageChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/CallAndMessageChecker.cpp
@@ -15,8 +15,8 @@
#include "ExprEngineInternalChecks.h"
#include "clang/AST/ParentMap.h"
#include "clang/Basic/TargetInfo.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/CastSizeChecker.cpp b/lib/StaticAnalyzer/Checkers/CastSizeChecker.cpp
similarity index 95%
rename from lib/EntoSA/Checkers/CastSizeChecker.cpp
rename to lib/StaticAnalyzer/Checkers/CastSizeChecker.cpp
index 41a72ef..9329ea3 100644
--- a/lib/EntoSA/Checkers/CastSizeChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/CastSizeChecker.cpp
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
#include "clang/AST/CharUnits.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
#include "ExprEngineInternalChecks.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/CastToStructChecker.cpp b/lib/StaticAnalyzer/Checkers/CastToStructChecker.cpp
similarity index 95%
rename from lib/EntoSA/Checkers/CastToStructChecker.cpp
rename to lib/StaticAnalyzer/Checkers/CastToStructChecker.cpp
index 83393b9..dd6ac7e 100644
--- a/lib/EntoSA/Checkers/CastToStructChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/CastToStructChecker.cpp
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
#include "ExprEngineInternalChecks.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/CheckDeadStores.cpp b/lib/StaticAnalyzer/Checkers/CheckDeadStores.cpp
similarity index 97%
rename from lib/EntoSA/Checkers/CheckDeadStores.cpp
rename to lib/StaticAnalyzer/Checkers/CheckDeadStores.cpp
index 047c83a..1fe40c5 100644
--- a/lib/EntoSA/Checkers/CheckDeadStores.cpp
+++ b/lib/StaticAnalyzer/Checkers/CheckDeadStores.cpp
@@ -12,11 +12,11 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
#include "clang/Analysis/Analyses/LiveVariables.h"
#include "clang/Analysis/Visitors/CFGRecStmtVisitor.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
#include "clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h"
#include "clang/Basic/Diagnostic.h"
#include "clang/AST/ASTContext.h"
diff --git a/lib/EntoSA/Checkers/CheckObjCDealloc.cpp b/lib/StaticAnalyzer/Checkers/CheckObjCDealloc.cpp
similarity index 97%
rename from lib/EntoSA/Checkers/CheckObjCDealloc.cpp
rename to lib/StaticAnalyzer/Checkers/CheckObjCDealloc.cpp
index 391e30f..932a6f5 100644
--- a/lib/EntoSA/Checkers/CheckObjCDealloc.cpp
+++ b/lib/StaticAnalyzer/Checkers/CheckObjCDealloc.cpp
@@ -13,9 +13,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include "clang/AST/ExprObjC.h"
#include "clang/AST/Expr.h"
#include "clang/AST/DeclObjC.h"
diff --git a/lib/EntoSA/Checkers/CheckObjCInstMethSignature.cpp b/lib/StaticAnalyzer/Checkers/CheckObjCInstMethSignature.cpp
similarity index 95%
rename from lib/EntoSA/Checkers/CheckObjCInstMethSignature.cpp
rename to lib/StaticAnalyzer/Checkers/CheckObjCInstMethSignature.cpp
index f908e69..57e388f 100644
--- a/lib/EntoSA/Checkers/CheckObjCInstMethSignature.cpp
+++ b/lib/StaticAnalyzer/Checkers/CheckObjCInstMethSignature.cpp
@@ -13,9 +13,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include "clang/AST/DeclObjC.h"
#include "clang/AST/Type.h"
#include "clang/AST/ASTContext.h"
diff --git a/lib/EntoSA/Checkers/CheckSecuritySyntaxOnly.cpp b/lib/StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp
similarity index 98%
rename from lib/EntoSA/Checkers/CheckSecuritySyntaxOnly.cpp
rename to lib/StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp
index 98da692..b30e985 100644
--- a/lib/EntoSA/Checkers/CheckSecuritySyntaxOnly.cpp
+++ b/lib/StaticAnalyzer/Checkers/CheckSecuritySyntaxOnly.cpp
@@ -12,8 +12,8 @@
//===----------------------------------------------------------------------===//
#include "clang/Basic/TargetInfo.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
#include "clang/AST/StmtVisitor.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/lib/EntoSA/Checkers/CheckSizeofPointer.cpp b/lib/StaticAnalyzer/Checkers/CheckSizeofPointer.cpp
similarity index 94%
rename from lib/EntoSA/Checkers/CheckSizeofPointer.cpp
rename to lib/StaticAnalyzer/Checkers/CheckSizeofPointer.cpp
index f7ab951..ed060b2 100644
--- a/lib/EntoSA/Checkers/CheckSizeofPointer.cpp
+++ b/lib/StaticAnalyzer/Checkers/CheckSizeofPointer.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include "clang/AST/StmtVisitor.h"
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/ChrootChecker.cpp b/lib/StaticAnalyzer/Checkers/ChrootChecker.cpp
similarity index 94%
rename from lib/EntoSA/Checkers/ChrootChecker.cpp
rename to lib/StaticAnalyzer/Checkers/ChrootChecker.cpp
index e951c29..a3f4daa 100644
--- a/lib/EntoSA/Checkers/ChrootChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/ChrootChecker.cpp
@@ -12,11 +12,11 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineExperimentalChecks.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 "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/SymbolManager.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/DereferenceChecker.cpp b/lib/StaticAnalyzer/Checkers/DereferenceChecker.cpp
similarity index 96%
rename from lib/EntoSA/Checkers/DereferenceChecker.cpp
rename to lib/StaticAnalyzer/Checkers/DereferenceChecker.cpp
index 35fae40..7dc8ec8 100644
--- a/lib/EntoSA/Checkers/DereferenceChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/DereferenceChecker.cpp
@@ -13,10 +13,10 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.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"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/Checkers/DereferenceChecker.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/DivZeroChecker.cpp b/lib/StaticAnalyzer/Checkers/DivZeroChecker.cpp
similarity index 95%
rename from lib/EntoSA/Checkers/DivZeroChecker.cpp
rename to lib/StaticAnalyzer/Checkers/DivZeroChecker.cpp
index 24c743a..8332af8 100644
--- a/lib/EntoSA/Checkers/DivZeroChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/DivZeroChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/ExprEngine.cpp b/lib/StaticAnalyzer/Checkers/ExprEngine.cpp
similarity index 99%
rename from lib/EntoSA/Checkers/ExprEngine.cpp
rename to lib/StaticAnalyzer/Checkers/ExprEngine.cpp
index afd6318..17bc339 100644
--- a/lib/EntoSA/Checkers/ExprEngine.cpp
+++ b/lib/StaticAnalyzer/Checkers/ExprEngine.cpp
@@ -16,11 +16,11 @@
// FIXME: Restructure checker registration.
#include "ExprEngineInternalChecks.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/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/AnalysisManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngineBuilders.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
#include "clang/AST/CharUnits.h"
#include "clang/AST/ParentMap.h"
#include "clang/AST/StmtObjC.h"
diff --git a/lib/EntoSA/Checkers/ExprEngineExperimentalChecks.cpp b/lib/StaticAnalyzer/Checkers/ExprEngineExperimentalChecks.cpp
similarity index 96%
rename from lib/EntoSA/Checkers/ExprEngineExperimentalChecks.cpp
rename to lib/StaticAnalyzer/Checkers/ExprEngineExperimentalChecks.cpp
index 6ab5a4d..52a3ace 100644
--- a/lib/EntoSA/Checkers/ExprEngineExperimentalChecks.cpp
+++ b/lib/StaticAnalyzer/Checkers/ExprEngineExperimentalChecks.cpp
@@ -14,7 +14,7 @@
#include "ExprEngineInternalChecks.h"
#include "ExprEngineExperimentalChecks.h"
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/ExprEngineExperimentalChecks.h b/lib/StaticAnalyzer/Checkers/ExprEngineExperimentalChecks.h
similarity index 100%
copy from lib/EntoSA/Checkers/ExprEngineExperimentalChecks.h
copy to lib/StaticAnalyzer/Checkers/ExprEngineExperimentalChecks.h
diff --git a/lib/EntoSA/Checkers/ExprEngineInternalChecks.h b/lib/StaticAnalyzer/Checkers/ExprEngineInternalChecks.h
similarity index 100%
copy from lib/EntoSA/Checkers/ExprEngineInternalChecks.h
copy to lib/StaticAnalyzer/Checkers/ExprEngineInternalChecks.h
diff --git a/lib/EntoSA/Checkers/FixedAddressChecker.cpp b/lib/StaticAnalyzer/Checkers/FixedAddressChecker.cpp
similarity index 94%
rename from lib/EntoSA/Checkers/FixedAddressChecker.cpp
rename to lib/StaticAnalyzer/Checkers/FixedAddressChecker.cpp
index ea73643..77e9876 100644
--- a/lib/EntoSA/Checkers/FixedAddressChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/FixedAddressChecker.cpp
@@ -14,8 +14,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/FrontendActions.cpp b/lib/StaticAnalyzer/Checkers/FrontendActions.cpp
similarity index 87%
rename from lib/EntoSA/Checkers/FrontendActions.cpp
rename to lib/StaticAnalyzer/Checkers/FrontendActions.cpp
index b901afc..b0e8e5d 100644
--- a/lib/EntoSA/Checkers/FrontendActions.cpp
+++ b/lib/StaticAnalyzer/Checkers/FrontendActions.cpp
@@ -7,9 +7,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/FrontendActions.h"
+#include "clang/StaticAnalyzer/FrontendActions.h"
#include "clang/Frontend/CompilerInstance.h"
-#include "clang/EntoSA/AnalysisConsumer.h"
+#include "clang/StaticAnalyzer/AnalysisConsumer.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/IdempotentOperationChecker.cpp b/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp
similarity index 98%
rename from lib/EntoSA/Checkers/IdempotentOperationChecker.cpp
rename to lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp
index 04f652c..435d3d4 100644
--- a/lib/EntoSA/Checkers/IdempotentOperationChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/IdempotentOperationChecker.cpp
@@ -45,12 +45,12 @@
#include "ExprEngineExperimentalChecks.h"
#include "clang/Analysis/CFGStmtMap.h"
#include "clang/Analysis/Analyses/PseudoConstantAnalysis.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/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerHelpers.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/CoreEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
#include "clang/AST/Stmt.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallSet.h"
diff --git a/lib/EntoSA/Checkers/LLVMConventionsChecker.cpp b/lib/StaticAnalyzer/Checkers/LLVMConventionsChecker.cpp
similarity index 98%
rename from lib/EntoSA/Checkers/LLVMConventionsChecker.cpp
rename to lib/StaticAnalyzer/Checkers/LLVMConventionsChecker.cpp
index e88997f..eefad95 100644
--- a/lib/EntoSA/Checkers/LLVMConventionsChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/LLVMConventionsChecker.cpp
@@ -14,8 +14,8 @@
#include "clang/AST/DeclTemplate.h"
#include "clang/AST/StmtVisitor.h"
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include <string>
#include "llvm/ADT/StringRef.h"
diff --git a/lib/EntoSA/Checkers/MacOSXAPIChecker.cpp b/lib/StaticAnalyzer/Checkers/MacOSXAPIChecker.cpp
similarity index 95%
rename from lib/EntoSA/Checkers/MacOSXAPIChecker.cpp
rename to lib/StaticAnalyzer/Checkers/MacOSXAPIChecker.cpp
index c2f5f4b..44887fa 100644
--- a/lib/EntoSA/Checkers/MacOSXAPIChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/MacOSXAPIChecker.cpp
@@ -17,9 +17,9 @@
#include "ExprEngineInternalChecks.h"
#include "clang/Basic/TargetInfo.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/lib/EntoSA/Checkers/Makefile b/lib/StaticAnalyzer/Checkers/Makefile
similarity index 92%
rename from lib/EntoSA/Checkers/Makefile
rename to lib/StaticAnalyzer/Checkers/Makefile
index 9ba4e28..d4de35c 100644
--- a/lib/EntoSA/Checkers/Makefile
+++ b/lib/StaticAnalyzer/Checkers/Makefile
@@ -12,6 +12,6 @@
##===----------------------------------------------------------------------===##
CLANG_LEVEL := ../../..
-LIBRARYNAME := clangEntoCheckers
+LIBRARYNAME := clangStaticAnalyzerCheckers
include $(CLANG_LEVEL)/Makefile
diff --git a/lib/EntoSA/Checkers/MallocChecker.cpp b/lib/StaticAnalyzer/Checkers/MallocChecker.cpp
similarity index 98%
rename from lib/EntoSA/Checkers/MallocChecker.cpp
rename to lib/StaticAnalyzer/Checkers/MallocChecker.cpp
index 2b0ae82..42243cb 100644
--- a/lib/EntoSA/Checkers/MallocChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/MallocChecker.cpp
@@ -13,11 +13,11 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineExperimentalChecks.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 "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/SymbolManager.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/NSAutoreleasePoolChecker.cpp b/lib/StaticAnalyzer/Checkers/NSAutoreleasePoolChecker.cpp
similarity index 93%
rename from lib/EntoSA/Checkers/NSAutoreleasePoolChecker.cpp
rename to lib/StaticAnalyzer/Checkers/NSAutoreleasePoolChecker.cpp
index acad46c..6ef242b 100644
--- a/lib/EntoSA/Checkers/NSAutoreleasePoolChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/NSAutoreleasePoolChecker.cpp
@@ -15,9 +15,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/BugReporter/BugReporter.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
#include "BasicObjCFoundationChecks.h"
#include "clang/AST/DeclObjC.h"
#include "clang/AST/Decl.h"
diff --git a/lib/EntoSA/Checkers/NSErrorChecker.cpp b/lib/StaticAnalyzer/Checkers/NSErrorChecker.cpp
similarity index 96%
rename from lib/EntoSA/Checkers/NSErrorChecker.cpp
rename to lib/StaticAnalyzer/Checkers/NSErrorChecker.cpp
index d5c395f..54e6118 100644
--- a/lib/EntoSA/Checkers/NSErrorChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/NSErrorChecker.cpp
@@ -15,10 +15,10 @@
//
//===----------------------------------------------------------------------===//
-#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 "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/Checkers/DereferenceChecker.h"
#include "BasicObjCFoundationChecks.h"
#include "clang/AST/DeclObjC.h"
#include "clang/AST/Decl.h"
diff --git a/lib/EntoSA/Checkers/NoReturnFunctionChecker.cpp b/lib/StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp
similarity index 97%
rename from lib/EntoSA/Checkers/NoReturnFunctionChecker.cpp
rename to lib/StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp
index 4b96ddb..8cdc04f 100644
--- a/lib/EntoSA/Checkers/NoReturnFunctionChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/NoReturnFunctionChecker.cpp
@@ -13,7 +13,7 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
#include "llvm/ADT/StringSwitch.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/OSAtomicChecker.cpp b/lib/StaticAnalyzer/Checkers/OSAtomicChecker.cpp
similarity index 98%
rename from lib/EntoSA/Checkers/OSAtomicChecker.cpp
rename to lib/StaticAnalyzer/Checkers/OSAtomicChecker.cpp
index cc67c3d..9931734 100644
--- a/lib/EntoSA/Checkers/OSAtomicChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/OSAtomicChecker.cpp
@@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/PathSensitive/Checker.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
#include "clang/Basic/Builtins.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/ObjCAtSyncChecker.cpp b/lib/StaticAnalyzer/Checkers/ObjCAtSyncChecker.cpp
similarity index 92%
rename from lib/EntoSA/Checkers/ObjCAtSyncChecker.cpp
rename to lib/StaticAnalyzer/Checkers/ObjCAtSyncChecker.cpp
index 3e901b6..2d94e8c 100644
--- a/lib/EntoSA/Checkers/ObjCAtSyncChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/ObjCAtSyncChecker.cpp
@@ -13,10 +13,10 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.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"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/Checkers/DereferenceChecker.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/ObjCUnusedIVarsChecker.cpp b/lib/StaticAnalyzer/Checkers/ObjCUnusedIVarsChecker.cpp
similarity index 96%
rename from lib/EntoSA/Checkers/ObjCUnusedIVarsChecker.cpp
rename to lib/StaticAnalyzer/Checkers/ObjCUnusedIVarsChecker.cpp
index a2e2475..799da33 100644
--- a/lib/EntoSA/Checkers/ObjCUnusedIVarsChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/ObjCUnusedIVarsChecker.cpp
@@ -13,9 +13,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include "clang/AST/ExprObjC.h"
#include "clang/AST/Expr.h"
#include "clang/AST/DeclObjC.h"
diff --git a/lib/EntoSA/Checkers/PointerArithChecker.cpp b/lib/StaticAnalyzer/Checkers/PointerArithChecker.cpp
similarity index 94%
rename from lib/EntoSA/Checkers/PointerArithChecker.cpp
rename to lib/StaticAnalyzer/Checkers/PointerArithChecker.cpp
index 30009a2..2b03dbc 100644
--- a/lib/EntoSA/Checkers/PointerArithChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/PointerArithChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/PointerSubChecker.cpp b/lib/StaticAnalyzer/Checkers/PointerSubChecker.cpp
similarity index 94%
rename from lib/EntoSA/Checkers/PointerSubChecker.cpp
rename to lib/StaticAnalyzer/Checkers/PointerSubChecker.cpp
index 923d0a8..1ba60f7 100644
--- a/lib/EntoSA/Checkers/PointerSubChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/PointerSubChecker.cpp
@@ -14,8 +14,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/PthreadLockChecker.cpp b/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp
similarity index 95%
rename from lib/EntoSA/Checkers/PthreadLockChecker.cpp
rename to lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp
index 56c9adb..7a91696 100644
--- a/lib/EntoSA/Checkers/PthreadLockChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/PthreadLockChecker.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
-#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
#include "ExprEngineExperimentalChecks.h"
#include "llvm/ADT/ImmutableSet.h"
diff --git a/lib/EntoSA/Checkers/ReturnPointerRangeChecker.cpp b/lib/StaticAnalyzer/Checkers/ReturnPointerRangeChecker.cpp
similarity index 94%
rename from lib/EntoSA/Checkers/ReturnPointerRangeChecker.cpp
rename to lib/StaticAnalyzer/Checkers/ReturnPointerRangeChecker.cpp
index 8afe984..a56c1b6 100644
--- a/lib/EntoSA/Checkers/ReturnPointerRangeChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/ReturnPointerRangeChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/ReturnUndefChecker.cpp b/lib/StaticAnalyzer/Checkers/ReturnUndefChecker.cpp
similarity index 90%
rename from lib/EntoSA/Checkers/ReturnUndefChecker.cpp
rename to lib/StaticAnalyzer/Checkers/ReturnUndefChecker.cpp
index 8e46519..50ffd32 100644
--- a/lib/EntoSA/Checkers/ReturnUndefChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/ReturnUndefChecker.cpp
@@ -14,9 +14,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/StackAddrLeakChecker.cpp b/lib/StaticAnalyzer/Checkers/StackAddrLeakChecker.cpp
similarity index 97%
rename from lib/EntoSA/Checkers/StackAddrLeakChecker.cpp
rename to lib/StaticAnalyzer/Checkers/StackAddrLeakChecker.cpp
index c9aebad..1ec5c32 100644
--- a/lib/EntoSA/Checkers/StackAddrLeakChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/StackAddrLeakChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
#include "clang/Basic/SourceManager.h"
#include "llvm/ADT/SmallString.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/StreamChecker.cpp b/lib/StaticAnalyzer/Checkers/StreamChecker.cpp
similarity index 97%
rename from lib/EntoSA/Checkers/StreamChecker.cpp
rename to lib/StaticAnalyzer/Checkers/StreamChecker.cpp
index cb7899f..a6d1e07 100644
--- a/lib/EntoSA/Checkers/StreamChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/StreamChecker.cpp
@@ -12,11 +12,11 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineExperimentalChecks.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 "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/SymbolManager.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/UndefBranchChecker.cpp b/lib/StaticAnalyzer/Checkers/UndefBranchChecker.cpp
similarity index 96%
rename from lib/EntoSA/Checkers/UndefBranchChecker.cpp
rename to lib/StaticAnalyzer/Checkers/UndefBranchChecker.cpp
index 30d0728..c0b3b7a 100644
--- a/lib/EntoSA/Checkers/UndefBranchChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/UndefBranchChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/Checker.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/UndefCapturedBlockVarChecker.cpp b/lib/StaticAnalyzer/Checkers/UndefCapturedBlockVarChecker.cpp
similarity index 94%
rename from lib/EntoSA/Checkers/UndefCapturedBlockVarChecker.cpp
rename to lib/StaticAnalyzer/Checkers/UndefCapturedBlockVarChecker.cpp
index dcdcf1f..57e698b 100644
--- a/lib/EntoSA/Checkers/UndefCapturedBlockVarChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/UndefCapturedBlockVarChecker.cpp
@@ -12,9 +12,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/UndefResultChecker.cpp b/lib/StaticAnalyzer/Checkers/UndefResultChecker.cpp
similarity index 93%
rename from lib/EntoSA/Checkers/UndefResultChecker.cpp
rename to lib/StaticAnalyzer/Checkers/UndefResultChecker.cpp
index c042740..91e489b 100644
--- a/lib/EntoSA/Checkers/UndefResultChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/UndefResultChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/UndefinedArraySubscriptChecker.cpp b/lib/StaticAnalyzer/Checkers/UndefinedArraySubscriptChecker.cpp
similarity index 93%
rename from lib/EntoSA/Checkers/UndefinedArraySubscriptChecker.cpp
rename to lib/StaticAnalyzer/Checkers/UndefinedArraySubscriptChecker.cpp
index aea78c0..2cd293b 100644
--- a/lib/EntoSA/Checkers/UndefinedArraySubscriptChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/UndefinedArraySubscriptChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/UndefinedAssignmentChecker.cpp b/lib/StaticAnalyzer/Checkers/UndefinedAssignmentChecker.cpp
similarity index 95%
rename from lib/EntoSA/Checkers/UndefinedAssignmentChecker.cpp
rename to lib/StaticAnalyzer/Checkers/UndefinedAssignmentChecker.cpp
index 5060cdf..3146bbd 100644
--- a/lib/EntoSA/Checkers/UndefinedAssignmentChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/UndefinedAssignmentChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/UnixAPIChecker.cpp b/lib/StaticAnalyzer/Checkers/UnixAPIChecker.cpp
similarity index 98%
rename from lib/EntoSA/Checkers/UnixAPIChecker.cpp
rename to lib/StaticAnalyzer/Checkers/UnixAPIChecker.cpp
index c45659c..9092f93 100644
--- a/lib/EntoSA/Checkers/UnixAPIChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/UnixAPIChecker.cpp
@@ -14,8 +14,8 @@
#include "ExprEngineInternalChecks.h"
#include "clang/Basic/TargetInfo.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/StringSwitch.h"
#include <fcntl.h>
diff --git a/lib/EntoSA/Checkers/UnreachableCodeChecker.cpp b/lib/StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp
similarity index 95%
rename from lib/EntoSA/Checkers/UnreachableCodeChecker.cpp
rename to lib/StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp
index e3ea72e..9883448 100644
--- a/lib/EntoSA/Checkers/UnreachableCodeChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp
@@ -16,11 +16,11 @@
#include "clang/AST/ParentMap.h"
#include "clang/Basic/Builtins.h"
#include "clang/Basic/SourceManager.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
-#include "clang/EntoSA/PathSensitive/SVals.h"
-#include "clang/EntoSA/PathSensitive/CheckerHelpers.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExplodedGraph.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerHelpers.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include "ExprEngineExperimentalChecks.h"
#include "llvm/ADT/SmallPtrSet.h"
diff --git a/lib/EntoSA/Checkers/VLASizeChecker.cpp b/lib/StaticAnalyzer/Checkers/VLASizeChecker.cpp
similarity index 95%
copy from lib/EntoSA/Checkers/VLASizeChecker.cpp
copy to lib/StaticAnalyzer/Checkers/VLASizeChecker.cpp
index 0d17238..e24521a 100644
--- a/lib/EntoSA/Checkers/VLASizeChecker.cpp
+++ b/lib/StaticAnalyzer/Checkers/VLASizeChecker.cpp
@@ -16,9 +16,9 @@
#include "ExprEngineInternalChecks.h"
#include "clang/AST/CharUnits.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/CoreEngine.cpp b/lib/StaticAnalyzer/CoreEngine.cpp
similarity index 98%
rename from lib/EntoSA/CoreEngine.cpp
rename to lib/StaticAnalyzer/CoreEngine.cpp
index 478e77b..a23c7f9 100644
--- a/lib/EntoSA/CoreEngine.cpp
+++ b/lib/StaticAnalyzer/CoreEngine.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
-#include "clang/EntoSA/PathSensitive/CoreEngine.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/AnalysisManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/CoreEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
#include "clang/Index/TranslationUnit.h"
#include "clang/AST/Expr.h"
#include "llvm/Support/Casting.h"
diff --git a/lib/EntoSA/AggExprVisitor.cpp b/lib/StaticAnalyzer/EntoSA/AggExprVisitor.cpp
similarity index 96%
copy from lib/EntoSA/AggExprVisitor.cpp
copy to lib/StaticAnalyzer/EntoSA/AggExprVisitor.cpp
index c356186..0cc2390 100644
--- a/lib/EntoSA/AggExprVisitor.cpp
+++ b/lib/StaticAnalyzer/EntoSA/AggExprVisitor.cpp
@@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
#include "clang/AST/StmtVisitor.h"
using namespace clang;
diff --git a/lib/EntoSA/AnalysisManager.cpp b/lib/StaticAnalyzer/EntoSA/AnalysisManager.cpp
similarity index 93%
copy from lib/EntoSA/AnalysisManager.cpp
copy to lib/StaticAnalyzer/EntoSA/AnalysisManager.cpp
index fa64f47..cc5e271 100644
--- a/lib/EntoSA/AnalysisManager.cpp
+++ b/lib/StaticAnalyzer/EntoSA/AnalysisManager.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/AnalysisManager.h"
#include "clang/Index/Entity.h"
#include "clang/Index/Indexer.h"
diff --git a/lib/EntoSA/AnalyzerStatsChecker.cpp b/lib/StaticAnalyzer/EntoSA/AnalyzerStatsChecker.cpp
similarity index 95%
copy from lib/EntoSA/AnalyzerStatsChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/AnalyzerStatsChecker.cpp
index fb0e74b..8521c18 100644
--- a/lib/EntoSA/AnalyzerStatsChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/AnalyzerStatsChecker.cpp
@@ -9,9 +9,9 @@
// This file reports various statistics about analyzer visitation.
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExplodedGraph.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
// FIXME: Restructure checker registration.
#include "Checkers/ExprEngineExperimentalChecks.h"
diff --git a/lib/EntoSA/BasicConstraintManager.cpp b/lib/StaticAnalyzer/EntoSA/BasicConstraintManager.cpp
similarity index 98%
copy from lib/EntoSA/BasicConstraintManager.cpp
copy to lib/StaticAnalyzer/EntoSA/BasicConstraintManager.cpp
index 92837d2..8bdc4fa 100644
--- a/lib/EntoSA/BasicConstraintManager.cpp
+++ b/lib/StaticAnalyzer/EntoSA/BasicConstraintManager.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "SimpleConstraintManager.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
-#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
-#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/TransferFuncs.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/lib/EntoSA/BasicStore.cpp b/lib/StaticAnalyzer/EntoSA/BasicStore.cpp
similarity index 99%
copy from lib/EntoSA/BasicStore.cpp
copy to lib/StaticAnalyzer/EntoSA/BasicStore.cpp
index 8c4a732..35bcf94 100644
--- a/lib/EntoSA/BasicStore.cpp
+++ b/lib/StaticAnalyzer/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/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
diff --git a/lib/EntoSA/BasicValueFactory.cpp b/lib/StaticAnalyzer/EntoSA/BasicValueFactory.cpp
similarity index 98%
copy from lib/EntoSA/BasicValueFactory.cpp
copy to lib/StaticAnalyzer/EntoSA/BasicValueFactory.cpp
index 0d1cb4a..d8b501b 100644
--- a/lib/EntoSA/BasicValueFactory.cpp
+++ b/lib/StaticAnalyzer/EntoSA/BasicValueFactory.cpp
@@ -13,7 +13,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/BasicValueFactory.h"
+#include "clang/StaticAnalyzer/PathSensitive/BasicValueFactory.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/BlockCounter.cpp b/lib/StaticAnalyzer/EntoSA/BlockCounter.cpp
similarity index 97%
copy from lib/EntoSA/BlockCounter.cpp
copy to lib/StaticAnalyzer/EntoSA/BlockCounter.cpp
index b4e6eee..47f6088 100644
--- a/lib/EntoSA/BlockCounter.cpp
+++ b/lib/StaticAnalyzer/EntoSA/BlockCounter.cpp
@@ -13,7 +13,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/BlockCounter.h"
+#include "clang/StaticAnalyzer/PathSensitive/BlockCounter.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
diff --git a/lib/EntoSA/BugReporter.cpp b/lib/StaticAnalyzer/EntoSA/BugReporter.cpp
similarity index 99%
copy from lib/EntoSA/BugReporter.cpp
copy to lib/StaticAnalyzer/EntoSA/BugReporter.cpp
index ff35024..8edbe14 100644
--- a/lib/EntoSA/BugReporter.cpp
+++ b/lib/StaticAnalyzer/EntoSA/BugReporter.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/BugReporter/BugReporter.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/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/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/STLExtras.h"
diff --git a/lib/EntoSA/BugReporterVisitors.cpp b/lib/StaticAnalyzer/EntoSA/BugReporterVisitors.cpp
similarity index 97%
copy from lib/EntoSA/BugReporterVisitors.cpp
copy to lib/StaticAnalyzer/EntoSA/BugReporterVisitors.cpp
index d264505..91d7275 100644
--- a/lib/EntoSA/BugReporterVisitors.cpp
+++ b/lib/StaticAnalyzer/EntoSA/BugReporterVisitors.cpp
@@ -14,10 +14,10 @@
#include "clang/AST/Expr.h"
#include "clang/AST/ExprObjC.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"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExplodedGraph.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/CFRefCount.cpp b/lib/StaticAnalyzer/EntoSA/CFRefCount.cpp
similarity index 99%
copy from lib/EntoSA/CFRefCount.cpp
copy to lib/StaticAnalyzer/EntoSA/CFRefCount.cpp
index 9c9637e..5fd223c 100644
--- a/lib/EntoSA/CFRefCount.cpp
+++ b/lib/StaticAnalyzer/EntoSA/CFRefCount.cpp
@@ -16,15 +16,15 @@
#include "clang/AST/StmtVisitor.h"
#include "clang/Basic/LangOptions.h"
#include "clang/Basic/SourceManager.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
#include "clang/Analysis/DomainSpecific/CocoaConventions.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 "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngineBuilders.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/TransferFuncs.h"
+#include "clang/StaticAnalyzer/PathSensitive/SymbolManager.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/ImmutableList.h"
diff --git a/lib/EntoSA/CMakeLists.txt b/lib/StaticAnalyzer/EntoSA/CMakeLists.txt
similarity index 85%
copy from lib/EntoSA/CMakeLists.txt
copy to lib/StaticAnalyzer/EntoSA/CMakeLists.txt
index 09a6c2f..cf81e1d 100644
--- a/lib/EntoSA/CMakeLists.txt
+++ b/lib/StaticAnalyzer/EntoSA/CMakeLists.txt
@@ -2,7 +2,7 @@
set(LLVM_USED_LIBS clangBasic clangLex clangAST clangFrontend clangRewrite)
-add_clang_library(clangEntoCore
+add_clang_library(clangStaticAnalyzerCore
AggExprVisitor.cpp
AnalysisManager.cpp
AnalyzerStatsChecker.cpp
@@ -37,5 +37,5 @@
TextPathDiagnostics.cpp
)
-add_dependencies(clangEntoCore ClangAttrClasses ClangAttrList ClangDeclNodes
+add_dependencies(clangStaticAnalyzerCore ClangAttrClasses ClangAttrList ClangDeclNodes
ClangStmtNodes)
diff --git a/lib/EntoSA/CXXExprEngine.cpp b/lib/StaticAnalyzer/EntoSA/CXXExprEngine.cpp
similarity index 98%
copy from lib/EntoSA/CXXExprEngine.cpp
copy to lib/StaticAnalyzer/EntoSA/CXXExprEngine.cpp
index 3ecd439..47b3a0b 100644
--- a/lib/EntoSA/CXXExprEngine.cpp
+++ b/lib/StaticAnalyzer/EntoSA/CXXExprEngine.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/AnalysisManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
#include "clang/AST/DeclCXX.h"
using namespace clang;
diff --git a/lib/EntoSA/Checker.cpp b/lib/StaticAnalyzer/EntoSA/Checker.cpp
similarity index 95%
copy from lib/EntoSA/Checker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checker.cpp
index 943be6b..6867ff5 100644
--- a/lib/EntoSA/Checker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checker.cpp
@@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/Checker.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/CheckerHelpers.cpp b/lib/StaticAnalyzer/EntoSA/CheckerHelpers.cpp
similarity index 96%
copy from lib/EntoSA/CheckerHelpers.cpp
copy to lib/StaticAnalyzer/EntoSA/CheckerHelpers.cpp
index 7c7f707..be9fee5 100644
--- a/lib/EntoSA/CheckerHelpers.cpp
+++ b/lib/StaticAnalyzer/EntoSA/CheckerHelpers.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/CheckerHelpers.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerHelpers.h"
#include "clang/AST/Expr.h"
// Recursively find any substatements containing macros
diff --git a/lib/EntoSA/Checkers/AdjustedReturnValueChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/AdjustedReturnValueChecker.cpp
similarity index 93%
copy from lib/EntoSA/Checkers/AdjustedReturnValueChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/AdjustedReturnValueChecker.cpp
index 914b1e4..46e2de5 100644
--- a/lib/EntoSA/Checkers/AdjustedReturnValueChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/AdjustedReturnValueChecker.cpp
@@ -14,9 +14,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/AnalysisConsumer.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/AnalysisConsumer.cpp
similarity index 97%
copy from lib/EntoSA/Checkers/AnalysisConsumer.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/AnalysisConsumer.cpp
index 043a24a..ee4eae2 100644
--- a/lib/EntoSA/Checkers/AnalysisConsumer.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/AnalysisConsumer.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/AnalysisConsumer.h"
+#include "clang/StaticAnalyzer/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/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"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/ManagerRegistry.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/PathSensitive/AnalysisManager.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/TransferFuncs.h"
+#include "clang/StaticAnalyzer/PathDiagnosticClients.h"
// FIXME: Restructure checker registration.
#include "ExprEngineExperimentalChecks.h"
diff --git a/lib/EntoSA/Checkers/ArrayBoundChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/ArrayBoundChecker.cpp
similarity index 93%
copy from lib/EntoSA/Checkers/ArrayBoundChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/ArrayBoundChecker.cpp
index c72a466..13e628b 100644
--- a/lib/EntoSA/Checkers/ArrayBoundChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/ArrayBoundChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/ArrayBoundCheckerV2.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/ArrayBoundCheckerV2.cpp
similarity index 97%
copy from lib/EntoSA/Checkers/ArrayBoundCheckerV2.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/ArrayBoundCheckerV2.cpp
index 33683ba..b55fade 100644
--- a/lib/EntoSA/Checkers/ArrayBoundCheckerV2.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/ArrayBoundCheckerV2.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
#include "clang/AST/CharUnits.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/AttrNonNullChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/AttrNonNullChecker.cpp
similarity index 96%
copy from lib/EntoSA/Checkers/AttrNonNullChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/AttrNonNullChecker.cpp
index f887e24..646b30b 100644
--- a/lib/EntoSA/Checkers/AttrNonNullChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/AttrNonNullChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/BasicObjCFoundationChecks.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/BasicObjCFoundationChecks.cpp
similarity index 96%
copy from lib/EntoSA/Checkers/BasicObjCFoundationChecks.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/BasicObjCFoundationChecks.cpp
index 8e83160..b4e2959 100644
--- a/lib/EntoSA/Checkers/BasicObjCFoundationChecks.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/BasicObjCFoundationChecks.cpp
@@ -15,14 +15,14 @@
#include "BasicObjCFoundationChecks.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/StaticAnalyzer/PathSensitive/ExplodedGraph.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/MemRegion.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
#include "clang/AST/DeclObjC.h"
#include "clang/AST/Expr.h"
#include "clang/AST/ExprObjC.h"
diff --git a/lib/EntoSA/Checkers/BasicObjCFoundationChecks.h b/lib/StaticAnalyzer/EntoSA/Checkers/BasicObjCFoundationChecks.h
similarity index 100%
rename from lib/EntoSA/Checkers/BasicObjCFoundationChecks.h
rename to lib/StaticAnalyzer/EntoSA/Checkers/BasicObjCFoundationChecks.h
diff --git a/lib/EntoSA/Checkers/BuiltinFunctionChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/BuiltinFunctionChecker.cpp
similarity index 97%
copy from lib/EntoSA/Checkers/BuiltinFunctionChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/BuiltinFunctionChecker.cpp
index 1db8aac..2e6f1b9 100644
--- a/lib/EntoSA/Checkers/BuiltinFunctionChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/BuiltinFunctionChecker.cpp
@@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/PathSensitive/Checker.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
#include "clang/Basic/Builtins.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/CMakeLists.txt b/lib/StaticAnalyzer/EntoSA/Checkers/CMakeLists.txt
similarity index 90%
copy from lib/EntoSA/Checkers/CMakeLists.txt
copy to lib/StaticAnalyzer/EntoSA/Checkers/CMakeLists.txt
index 224a515..e4b9541 100644
--- a/lib/EntoSA/Checkers/CMakeLists.txt
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_clang_library(clangEntoCheckers
+add_clang_library(clangStaticAnalyzerCheckers
AdjustedReturnValueChecker.cpp
AnalysisConsumer.cpp
ArrayBoundChecker.cpp
@@ -49,5 +49,5 @@
VLASizeChecker.cpp
)
-add_dependencies(clangEntoCore ClangAttrClasses ClangAttrList ClangDeclNodes
+add_dependencies(clangStaticAnalyzerCore ClangAttrClasses ClangAttrList ClangDeclNodes
ClangStmtNodes)
diff --git a/lib/EntoSA/Checkers/CStringChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/CStringChecker.cpp
similarity index 99%
copy from lib/EntoSA/Checkers/CStringChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/CStringChecker.cpp
index 199d6b2..b7513c3 100644
--- a/lib/EntoSA/Checkers/CStringChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/CStringChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineExperimentalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
#include "llvm/ADT/StringSwitch.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/CallAndMessageChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/CallAndMessageChecker.cpp
similarity index 98%
copy from lib/EntoSA/Checkers/CallAndMessageChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/CallAndMessageChecker.cpp
index 2fa37e3..2998406 100644
--- a/lib/EntoSA/Checkers/CallAndMessageChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/CallAndMessageChecker.cpp
@@ -15,8 +15,8 @@
#include "ExprEngineInternalChecks.h"
#include "clang/AST/ParentMap.h"
#include "clang/Basic/TargetInfo.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/CastSizeChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/CastSizeChecker.cpp
similarity index 95%
copy from lib/EntoSA/Checkers/CastSizeChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/CastSizeChecker.cpp
index 41a72ef..9329ea3 100644
--- a/lib/EntoSA/Checkers/CastSizeChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/CastSizeChecker.cpp
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
#include "clang/AST/CharUnits.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
#include "ExprEngineInternalChecks.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/CastToStructChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/CastToStructChecker.cpp
similarity index 95%
copy from lib/EntoSA/Checkers/CastToStructChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/CastToStructChecker.cpp
index 83393b9..dd6ac7e 100644
--- a/lib/EntoSA/Checkers/CastToStructChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/CastToStructChecker.cpp
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
#include "ExprEngineInternalChecks.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/CheckDeadStores.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/CheckDeadStores.cpp
similarity index 97%
copy from lib/EntoSA/Checkers/CheckDeadStores.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/CheckDeadStores.cpp
index 047c83a..1fe40c5 100644
--- a/lib/EntoSA/Checkers/CheckDeadStores.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/CheckDeadStores.cpp
@@ -12,11 +12,11 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
#include "clang/Analysis/Analyses/LiveVariables.h"
#include "clang/Analysis/Visitors/CFGRecStmtVisitor.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
#include "clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h"
#include "clang/Basic/Diagnostic.h"
#include "clang/AST/ASTContext.h"
diff --git a/lib/EntoSA/Checkers/CheckObjCDealloc.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/CheckObjCDealloc.cpp
similarity index 97%
copy from lib/EntoSA/Checkers/CheckObjCDealloc.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/CheckObjCDealloc.cpp
index 391e30f..932a6f5 100644
--- a/lib/EntoSA/Checkers/CheckObjCDealloc.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/CheckObjCDealloc.cpp
@@ -13,9 +13,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include "clang/AST/ExprObjC.h"
#include "clang/AST/Expr.h"
#include "clang/AST/DeclObjC.h"
diff --git a/lib/EntoSA/Checkers/CheckObjCInstMethSignature.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/CheckObjCInstMethSignature.cpp
similarity index 95%
copy from lib/EntoSA/Checkers/CheckObjCInstMethSignature.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/CheckObjCInstMethSignature.cpp
index f908e69..57e388f 100644
--- a/lib/EntoSA/Checkers/CheckObjCInstMethSignature.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/CheckObjCInstMethSignature.cpp
@@ -13,9 +13,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include "clang/AST/DeclObjC.h"
#include "clang/AST/Type.h"
#include "clang/AST/ASTContext.h"
diff --git a/lib/EntoSA/Checkers/CheckSecuritySyntaxOnly.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/CheckSecuritySyntaxOnly.cpp
similarity index 98%
copy from lib/EntoSA/Checkers/CheckSecuritySyntaxOnly.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/CheckSecuritySyntaxOnly.cpp
index 98da692..b30e985 100644
--- a/lib/EntoSA/Checkers/CheckSecuritySyntaxOnly.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/CheckSecuritySyntaxOnly.cpp
@@ -12,8 +12,8 @@
//===----------------------------------------------------------------------===//
#include "clang/Basic/TargetInfo.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
#include "clang/AST/StmtVisitor.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/lib/EntoSA/Checkers/CheckSizeofPointer.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/CheckSizeofPointer.cpp
similarity index 94%
copy from lib/EntoSA/Checkers/CheckSizeofPointer.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/CheckSizeofPointer.cpp
index f7ab951..ed060b2 100644
--- a/lib/EntoSA/Checkers/CheckSizeofPointer.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/CheckSizeofPointer.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include "clang/AST/StmtVisitor.h"
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/ChrootChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/ChrootChecker.cpp
similarity index 94%
copy from lib/EntoSA/Checkers/ChrootChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/ChrootChecker.cpp
index e951c29..a3f4daa 100644
--- a/lib/EntoSA/Checkers/ChrootChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/ChrootChecker.cpp
@@ -12,11 +12,11 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineExperimentalChecks.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 "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/SymbolManager.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/DereferenceChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/DereferenceChecker.cpp
similarity index 96%
copy from lib/EntoSA/Checkers/DereferenceChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/DereferenceChecker.cpp
index 35fae40..7dc8ec8 100644
--- a/lib/EntoSA/Checkers/DereferenceChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/DereferenceChecker.cpp
@@ -13,10 +13,10 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.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"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/Checkers/DereferenceChecker.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/DivZeroChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/DivZeroChecker.cpp
similarity index 95%
copy from lib/EntoSA/Checkers/DivZeroChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/DivZeroChecker.cpp
index 24c743a..8332af8 100644
--- a/lib/EntoSA/Checkers/DivZeroChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/DivZeroChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/ExprEngine.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/ExprEngine.cpp
similarity index 99%
copy from lib/EntoSA/Checkers/ExprEngine.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/ExprEngine.cpp
index afd6318..17bc339 100644
--- a/lib/EntoSA/Checkers/ExprEngine.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/ExprEngine.cpp
@@ -16,11 +16,11 @@
// FIXME: Restructure checker registration.
#include "ExprEngineInternalChecks.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/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/AnalysisManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngineBuilders.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
#include "clang/AST/CharUnits.h"
#include "clang/AST/ParentMap.h"
#include "clang/AST/StmtObjC.h"
diff --git a/lib/EntoSA/Checkers/ExprEngineExperimentalChecks.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/ExprEngineExperimentalChecks.cpp
similarity index 96%
copy from lib/EntoSA/Checkers/ExprEngineExperimentalChecks.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/ExprEngineExperimentalChecks.cpp
index 6ab5a4d..52a3ace 100644
--- a/lib/EntoSA/Checkers/ExprEngineExperimentalChecks.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/ExprEngineExperimentalChecks.cpp
@@ -14,7 +14,7 @@
#include "ExprEngineInternalChecks.h"
#include "ExprEngineExperimentalChecks.h"
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/ExprEngineExperimentalChecks.h b/lib/StaticAnalyzer/EntoSA/Checkers/ExprEngineExperimentalChecks.h
similarity index 100%
rename from lib/EntoSA/Checkers/ExprEngineExperimentalChecks.h
rename to lib/StaticAnalyzer/EntoSA/Checkers/ExprEngineExperimentalChecks.h
diff --git a/lib/EntoSA/Checkers/ExprEngineInternalChecks.h b/lib/StaticAnalyzer/EntoSA/Checkers/ExprEngineInternalChecks.h
similarity index 100%
rename from lib/EntoSA/Checkers/ExprEngineInternalChecks.h
rename to lib/StaticAnalyzer/EntoSA/Checkers/ExprEngineInternalChecks.h
diff --git a/lib/EntoSA/Checkers/FixedAddressChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/FixedAddressChecker.cpp
similarity index 94%
copy from lib/EntoSA/Checkers/FixedAddressChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/FixedAddressChecker.cpp
index ea73643..77e9876 100644
--- a/lib/EntoSA/Checkers/FixedAddressChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/FixedAddressChecker.cpp
@@ -14,8 +14,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/FrontendActions.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/FrontendActions.cpp
similarity index 87%
copy from lib/EntoSA/Checkers/FrontendActions.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/FrontendActions.cpp
index b901afc..b0e8e5d 100644
--- a/lib/EntoSA/Checkers/FrontendActions.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/FrontendActions.cpp
@@ -7,9 +7,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/FrontendActions.h"
+#include "clang/StaticAnalyzer/FrontendActions.h"
#include "clang/Frontend/CompilerInstance.h"
-#include "clang/EntoSA/AnalysisConsumer.h"
+#include "clang/StaticAnalyzer/AnalysisConsumer.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/IdempotentOperationChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/IdempotentOperationChecker.cpp
similarity index 98%
copy from lib/EntoSA/Checkers/IdempotentOperationChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/IdempotentOperationChecker.cpp
index 04f652c..435d3d4 100644
--- a/lib/EntoSA/Checkers/IdempotentOperationChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/IdempotentOperationChecker.cpp
@@ -45,12 +45,12 @@
#include "ExprEngineExperimentalChecks.h"
#include "clang/Analysis/CFGStmtMap.h"
#include "clang/Analysis/Analyses/PseudoConstantAnalysis.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/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerHelpers.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/CoreEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
#include "clang/AST/Stmt.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallSet.h"
diff --git a/lib/EntoSA/Checkers/LLVMConventionsChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/LLVMConventionsChecker.cpp
similarity index 98%
copy from lib/EntoSA/Checkers/LLVMConventionsChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/LLVMConventionsChecker.cpp
index e88997f..eefad95 100644
--- a/lib/EntoSA/Checkers/LLVMConventionsChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/LLVMConventionsChecker.cpp
@@ -14,8 +14,8 @@
#include "clang/AST/DeclTemplate.h"
#include "clang/AST/StmtVisitor.h"
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include <string>
#include "llvm/ADT/StringRef.h"
diff --git a/lib/EntoSA/Checkers/MacOSXAPIChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/MacOSXAPIChecker.cpp
similarity index 95%
copy from lib/EntoSA/Checkers/MacOSXAPIChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/MacOSXAPIChecker.cpp
index c2f5f4b..44887fa 100644
--- a/lib/EntoSA/Checkers/MacOSXAPIChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/MacOSXAPIChecker.cpp
@@ -17,9 +17,9 @@
#include "ExprEngineInternalChecks.h"
#include "clang/Basic/TargetInfo.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/lib/EntoSA/Checkers/Makefile b/lib/StaticAnalyzer/EntoSA/Checkers/Makefile
similarity index 92%
copy from lib/EntoSA/Checkers/Makefile
copy to lib/StaticAnalyzer/EntoSA/Checkers/Makefile
index 9ba4e28..d4de35c 100644
--- a/lib/EntoSA/Checkers/Makefile
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/Makefile
@@ -12,6 +12,6 @@
##===----------------------------------------------------------------------===##
CLANG_LEVEL := ../../..
-LIBRARYNAME := clangEntoCheckers
+LIBRARYNAME := clangStaticAnalyzerCheckers
include $(CLANG_LEVEL)/Makefile
diff --git a/lib/EntoSA/Checkers/MallocChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/MallocChecker.cpp
similarity index 98%
copy from lib/EntoSA/Checkers/MallocChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/MallocChecker.cpp
index 2b0ae82..42243cb 100644
--- a/lib/EntoSA/Checkers/MallocChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/MallocChecker.cpp
@@ -13,11 +13,11 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineExperimentalChecks.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 "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/SymbolManager.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/NSAutoreleasePoolChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/NSAutoreleasePoolChecker.cpp
similarity index 93%
copy from lib/EntoSA/Checkers/NSAutoreleasePoolChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/NSAutoreleasePoolChecker.cpp
index acad46c..6ef242b 100644
--- a/lib/EntoSA/Checkers/NSAutoreleasePoolChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/NSAutoreleasePoolChecker.cpp
@@ -15,9 +15,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/BugReporter/BugReporter.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
#include "BasicObjCFoundationChecks.h"
#include "clang/AST/DeclObjC.h"
#include "clang/AST/Decl.h"
diff --git a/lib/EntoSA/Checkers/NSErrorChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/NSErrorChecker.cpp
similarity index 96%
copy from lib/EntoSA/Checkers/NSErrorChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/NSErrorChecker.cpp
index d5c395f..54e6118 100644
--- a/lib/EntoSA/Checkers/NSErrorChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/NSErrorChecker.cpp
@@ -15,10 +15,10 @@
//
//===----------------------------------------------------------------------===//
-#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 "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/Checkers/DereferenceChecker.h"
#include "BasicObjCFoundationChecks.h"
#include "clang/AST/DeclObjC.h"
#include "clang/AST/Decl.h"
diff --git a/lib/EntoSA/Checkers/NoReturnFunctionChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/NoReturnFunctionChecker.cpp
similarity index 97%
copy from lib/EntoSA/Checkers/NoReturnFunctionChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/NoReturnFunctionChecker.cpp
index 4b96ddb..8cdc04f 100644
--- a/lib/EntoSA/Checkers/NoReturnFunctionChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/NoReturnFunctionChecker.cpp
@@ -13,7 +13,7 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
#include "llvm/ADT/StringSwitch.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/OSAtomicChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/OSAtomicChecker.cpp
similarity index 98%
copy from lib/EntoSA/Checkers/OSAtomicChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/OSAtomicChecker.cpp
index cc67c3d..9931734 100644
--- a/lib/EntoSA/Checkers/OSAtomicChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/OSAtomicChecker.cpp
@@ -12,7 +12,7 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/PathSensitive/Checker.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
#include "clang/Basic/Builtins.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/ObjCAtSyncChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/ObjCAtSyncChecker.cpp
similarity index 92%
copy from lib/EntoSA/Checkers/ObjCAtSyncChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/ObjCAtSyncChecker.cpp
index 3e901b6..2d94e8c 100644
--- a/lib/EntoSA/Checkers/ObjCAtSyncChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/ObjCAtSyncChecker.cpp
@@ -13,10 +13,10 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.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"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/Checkers/DereferenceChecker.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/ObjCUnusedIVarsChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/ObjCUnusedIVarsChecker.cpp
similarity index 96%
copy from lib/EntoSA/Checkers/ObjCUnusedIVarsChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/ObjCUnusedIVarsChecker.cpp
index a2e2475..799da33 100644
--- a/lib/EntoSA/Checkers/ObjCUnusedIVarsChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/ObjCUnusedIVarsChecker.cpp
@@ -13,9 +13,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/Checkers/LocalCheckers.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include "clang/AST/ExprObjC.h"
#include "clang/AST/Expr.h"
#include "clang/AST/DeclObjC.h"
diff --git a/lib/EntoSA/Checkers/PointerArithChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/PointerArithChecker.cpp
similarity index 94%
copy from lib/EntoSA/Checkers/PointerArithChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/PointerArithChecker.cpp
index 30009a2..2b03dbc 100644
--- a/lib/EntoSA/Checkers/PointerArithChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/PointerArithChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/PointerSubChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/PointerSubChecker.cpp
similarity index 94%
copy from lib/EntoSA/Checkers/PointerSubChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/PointerSubChecker.cpp
index 923d0a8..1ba60f7 100644
--- a/lib/EntoSA/Checkers/PointerSubChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/PointerSubChecker.cpp
@@ -14,8 +14,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/PthreadLockChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/PthreadLockChecker.cpp
similarity index 95%
copy from lib/EntoSA/Checkers/PthreadLockChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/PthreadLockChecker.cpp
index 56c9adb..7a91696 100644
--- a/lib/EntoSA/Checkers/PthreadLockChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/PthreadLockChecker.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
-#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
#include "ExprEngineExperimentalChecks.h"
#include "llvm/ADT/ImmutableSet.h"
diff --git a/lib/EntoSA/Checkers/ReturnPointerRangeChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/ReturnPointerRangeChecker.cpp
similarity index 94%
copy from lib/EntoSA/Checkers/ReturnPointerRangeChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/ReturnPointerRangeChecker.cpp
index 8afe984..a56c1b6 100644
--- a/lib/EntoSA/Checkers/ReturnPointerRangeChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/ReturnPointerRangeChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/ReturnUndefChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/ReturnUndefChecker.cpp
similarity index 90%
copy from lib/EntoSA/Checkers/ReturnUndefChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/ReturnUndefChecker.cpp
index 8e46519..50ffd32 100644
--- a/lib/EntoSA/Checkers/ReturnUndefChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/ReturnUndefChecker.cpp
@@ -14,9 +14,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/StackAddrLeakChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/StackAddrLeakChecker.cpp
similarity index 97%
copy from lib/EntoSA/Checkers/StackAddrLeakChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/StackAddrLeakChecker.cpp
index c9aebad..1ec5c32 100644
--- a/lib/EntoSA/Checkers/StackAddrLeakChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/StackAddrLeakChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
#include "clang/Basic/SourceManager.h"
#include "llvm/ADT/SmallString.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/StreamChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/StreamChecker.cpp
similarity index 97%
copy from lib/EntoSA/Checkers/StreamChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/StreamChecker.cpp
index cb7899f..a6d1e07 100644
--- a/lib/EntoSA/Checkers/StreamChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/StreamChecker.cpp
@@ -12,11 +12,11 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineExperimentalChecks.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 "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/SymbolManager.h"
#include "llvm/ADT/ImmutableMap.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/UndefBranchChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/UndefBranchChecker.cpp
similarity index 96%
copy from lib/EntoSA/Checkers/UndefBranchChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/UndefBranchChecker.cpp
index 30d0728..c0b3b7a 100644
--- a/lib/EntoSA/Checkers/UndefBranchChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/UndefBranchChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/Checker.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/UndefCapturedBlockVarChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/UndefCapturedBlockVarChecker.cpp
similarity index 94%
copy from lib/EntoSA/Checkers/UndefCapturedBlockVarChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/UndefCapturedBlockVarChecker.cpp
index dcdcf1f..57e698b 100644
--- a/lib/EntoSA/Checkers/UndefCapturedBlockVarChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/UndefCapturedBlockVarChecker.cpp
@@ -12,9 +12,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/lib/EntoSA/Checkers/UndefResultChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/UndefResultChecker.cpp
similarity index 93%
copy from lib/EntoSA/Checkers/UndefResultChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/UndefResultChecker.cpp
index c042740..91e489b 100644
--- a/lib/EntoSA/Checkers/UndefResultChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/UndefResultChecker.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/UndefinedArraySubscriptChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/UndefinedArraySubscriptChecker.cpp
similarity index 93%
copy from lib/EntoSA/Checkers/UndefinedArraySubscriptChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/UndefinedArraySubscriptChecker.cpp
index aea78c0..2cd293b 100644
--- a/lib/EntoSA/Checkers/UndefinedArraySubscriptChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/UndefinedArraySubscriptChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/UndefinedAssignmentChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/UndefinedAssignmentChecker.cpp
similarity index 95%
copy from lib/EntoSA/Checkers/UndefinedAssignmentChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/UndefinedAssignmentChecker.cpp
index 5060cdf..3146bbd 100644
--- a/lib/EntoSA/Checkers/UndefinedAssignmentChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/UndefinedAssignmentChecker.cpp
@@ -13,8 +13,8 @@
//===----------------------------------------------------------------------===//
#include "ExprEngineInternalChecks.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Checkers/UnixAPIChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/UnixAPIChecker.cpp
similarity index 98%
copy from lib/EntoSA/Checkers/UnixAPIChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/UnixAPIChecker.cpp
index c45659c..9092f93 100644
--- a/lib/EntoSA/Checkers/UnixAPIChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/UnixAPIChecker.cpp
@@ -14,8 +14,8 @@
#include "ExprEngineInternalChecks.h"
#include "clang/Basic/TargetInfo.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/StringSwitch.h"
#include <fcntl.h>
diff --git a/lib/EntoSA/Checkers/UnreachableCodeChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/UnreachableCodeChecker.cpp
similarity index 95%
copy from lib/EntoSA/Checkers/UnreachableCodeChecker.cpp
copy to lib/StaticAnalyzer/EntoSA/Checkers/UnreachableCodeChecker.cpp
index e3ea72e..9883448 100644
--- a/lib/EntoSA/Checkers/UnreachableCodeChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/UnreachableCodeChecker.cpp
@@ -16,11 +16,11 @@
#include "clang/AST/ParentMap.h"
#include "clang/Basic/Builtins.h"
#include "clang/Basic/SourceManager.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
-#include "clang/EntoSA/PathSensitive/SVals.h"
-#include "clang/EntoSA/PathSensitive/CheckerHelpers.h"
-#include "clang/EntoSA/BugReporter/BugReporter.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExplodedGraph.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerHelpers.h"
+#include "clang/StaticAnalyzer/BugReporter/BugReporter.h"
#include "ExprEngineExperimentalChecks.h"
#include "llvm/ADT/SmallPtrSet.h"
diff --git a/lib/EntoSA/Checkers/VLASizeChecker.cpp b/lib/StaticAnalyzer/EntoSA/Checkers/VLASizeChecker.cpp
similarity index 96%
rename from lib/EntoSA/Checkers/VLASizeChecker.cpp
rename to lib/StaticAnalyzer/EntoSA/Checkers/VLASizeChecker.cpp
index 0d17238..e24521a 100644
--- a/lib/EntoSA/Checkers/VLASizeChecker.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Checkers/VLASizeChecker.cpp
@@ -16,9 +16,9 @@
#include "ExprEngineInternalChecks.h"
#include "clang/AST/CharUnits.h"
-#include "clang/EntoSA/BugReporter/BugType.h"
-#include "clang/EntoSA/PathSensitive/CheckerVisitor.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/BugReporter/BugType.h"
+#include "clang/StaticAnalyzer/PathSensitive/CheckerVisitor.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/CoreEngine.cpp b/lib/StaticAnalyzer/EntoSA/CoreEngine.cpp
similarity index 98%
copy from lib/EntoSA/CoreEngine.cpp
copy to lib/StaticAnalyzer/EntoSA/CoreEngine.cpp
index 478e77b..a23c7f9 100644
--- a/lib/EntoSA/CoreEngine.cpp
+++ b/lib/StaticAnalyzer/EntoSA/CoreEngine.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/AnalysisManager.h"
-#include "clang/EntoSA/PathSensitive/CoreEngine.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/AnalysisManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/CoreEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
#include "clang/Index/TranslationUnit.h"
#include "clang/AST/Expr.h"
#include "llvm/Support/Casting.h"
diff --git a/lib/EntoSA/Environment.cpp b/lib/StaticAnalyzer/EntoSA/Environment.cpp
similarity index 98%
rename from lib/EntoSA/Environment.cpp
rename to lib/StaticAnalyzer/EntoSA/Environment.cpp
index eecbabb..1c74352 100644
--- a/lib/EntoSA/Environment.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Environment.cpp
@@ -13,7 +13,7 @@
#include "clang/Analysis/AnalysisContext.h"
#include "clang/Analysis/CFG.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/ExplodedGraph.cpp b/lib/StaticAnalyzer/EntoSA/ExplodedGraph.cpp
similarity index 98%
rename from lib/EntoSA/ExplodedGraph.cpp
rename to lib/StaticAnalyzer/EntoSA/ExplodedGraph.cpp
index ec66ba6..4c4612f 100644
--- a/lib/EntoSA/ExplodedGraph.cpp
+++ b/lib/StaticAnalyzer/EntoSA/ExplodedGraph.cpp
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExplodedGraph.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
#include "clang/AST/Stmt.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/DenseMap.h"
diff --git a/lib/EntoSA/FlatStore.cpp b/lib/StaticAnalyzer/EntoSA/FlatStore.cpp
similarity index 98%
rename from lib/EntoSA/FlatStore.cpp
rename to lib/StaticAnalyzer/EntoSA/FlatStore.cpp
index 8ded4d1..1558db7 100644
--- a/lib/EntoSA/FlatStore.cpp
+++ b/lib/StaticAnalyzer/EntoSA/FlatStore.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
#include "llvm/ADT/ImmutableIntervalMap.h"
#include "llvm/Support/ErrorHandling.h"
diff --git a/lib/EntoSA/GRState.cpp b/lib/StaticAnalyzer/EntoSA/GRState.cpp
similarity index 98%
rename from lib/EntoSA/GRState.cpp
rename to lib/StaticAnalyzer/EntoSA/GRState.cpp
index 6239623..12c8968 100644
--- a/lib/EntoSA/GRState.cpp
+++ b/lib/StaticAnalyzer/EntoSA/GRState.cpp
@@ -12,10 +12,10 @@
//===----------------------------------------------------------------------===//
#include "clang/Analysis/CFG.h"
-#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
-#include "clang/EntoSA/PathSensitive/SubEngine.h"
-#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/SubEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/TransferFuncs.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/lib/EntoSA/HTMLDiagnostics.cpp b/lib/StaticAnalyzer/EntoSA/HTMLDiagnostics.cpp
similarity index 98%
rename from lib/EntoSA/HTMLDiagnostics.cpp
rename to lib/StaticAnalyzer/EntoSA/HTMLDiagnostics.cpp
index a0d338a..659c32d 100644
--- a/lib/EntoSA/HTMLDiagnostics.cpp
+++ b/lib/StaticAnalyzer/EntoSA/HTMLDiagnostics.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathDiagnosticClients.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/PathDiagnosticClients.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
#include "clang/AST/ASTContext.h"
#include "clang/AST/Decl.h"
#include "clang/Basic/SourceManager.h"
diff --git a/lib/EntoSA/Makefile b/lib/StaticAnalyzer/EntoSA/Makefile
similarity index 93%
rename from lib/EntoSA/Makefile
rename to lib/StaticAnalyzer/EntoSA/Makefile
index 9678138..08ace28 100644
--- a/lib/EntoSA/Makefile
+++ b/lib/StaticAnalyzer/EntoSA/Makefile
@@ -12,7 +12,7 @@
##===----------------------------------------------------------------------===##
CLANG_LEVEL := ../..
-LIBRARYNAME := clangEntoCore
+LIBRARYNAME := clangStaticAnalyzerCore
PARALLEL_DIRS := Checkers
include $(CLANG_LEVEL)/Makefile
diff --git a/lib/EntoSA/ManagerRegistry.cpp b/lib/StaticAnalyzer/EntoSA/ManagerRegistry.cpp
similarity index 92%
rename from lib/EntoSA/ManagerRegistry.cpp
rename to lib/StaticAnalyzer/EntoSA/ManagerRegistry.cpp
index 99b7a70..3f9ed61 100644
--- a/lib/EntoSA/ManagerRegistry.cpp
+++ b/lib/StaticAnalyzer/EntoSA/ManagerRegistry.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/ManagerRegistry.h"
+#include "clang/StaticAnalyzer/ManagerRegistry.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/MemRegion.cpp b/lib/StaticAnalyzer/EntoSA/MemRegion.cpp
similarity index 99%
rename from lib/EntoSA/MemRegion.cpp
rename to lib/StaticAnalyzer/EntoSA/MemRegion.cpp
index ff0f340..e465224 100644
--- a/lib/EntoSA/MemRegion.cpp
+++ b/lib/StaticAnalyzer/EntoSA/MemRegion.cpp
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/MemRegion.h"
-#include "clang/EntoSA/PathSensitive/SValBuilder.h"
+#include "clang/StaticAnalyzer/PathSensitive/MemRegion.h"
+#include "clang/StaticAnalyzer/PathSensitive/SValBuilder.h"
#include "clang/Analysis/AnalysisContext.h"
#include "clang/Analysis/Support/BumpVector.h"
#include "clang/AST/CharUnits.h"
diff --git a/lib/EntoSA/PathDiagnostic.cpp b/lib/StaticAnalyzer/EntoSA/PathDiagnostic.cpp
similarity index 98%
rename from lib/EntoSA/PathDiagnostic.cpp
rename to lib/StaticAnalyzer/EntoSA/PathDiagnostic.cpp
index bf8c8b0..f05dec8 100644
--- a/lib/EntoSA/PathDiagnostic.cpp
+++ b/lib/StaticAnalyzer/EntoSA/PathDiagnostic.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
#include "clang/AST/Expr.h"
#include "clang/AST/Decl.h"
#include "clang/AST/DeclObjC.h"
diff --git a/lib/EntoSA/PlistDiagnostics.cpp b/lib/StaticAnalyzer/EntoSA/PlistDiagnostics.cpp
similarity index 98%
rename from lib/EntoSA/PlistDiagnostics.cpp
rename to lib/StaticAnalyzer/EntoSA/PlistDiagnostics.cpp
index 6e54d49..ecc0cff 100644
--- a/lib/EntoSA/PlistDiagnostics.cpp
+++ b/lib/StaticAnalyzer/EntoSA/PlistDiagnostics.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathDiagnosticClients.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/PathDiagnosticClients.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
#include "clang/Basic/SourceManager.h"
#include "clang/Basic/FileManager.h"
#include "clang/Lex/Preprocessor.h"
diff --git a/lib/EntoSA/README.txt b/lib/StaticAnalyzer/EntoSA/README.txt
similarity index 100%
rename from lib/EntoSA/README.txt
rename to lib/StaticAnalyzer/EntoSA/README.txt
diff --git a/lib/EntoSA/RangeConstraintManager.cpp b/lib/StaticAnalyzer/EntoSA/RangeConstraintManager.cpp
similarity index 98%
rename from lib/EntoSA/RangeConstraintManager.cpp
rename to lib/StaticAnalyzer/EntoSA/RangeConstraintManager.cpp
index 5c2d674..c89fa50 100644
--- a/lib/EntoSA/RangeConstraintManager.cpp
+++ b/lib/StaticAnalyzer/EntoSA/RangeConstraintManager.cpp
@@ -13,10 +13,10 @@
//===----------------------------------------------------------------------===//
#include "SimpleConstraintManager.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
-#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
-#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
-#include "clang/EntoSA/ManagerRegistry.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/TransferFuncs.h"
+#include "clang/StaticAnalyzer/ManagerRegistry.h"
#include "llvm/Support/Debug.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/ImmutableSet.h"
diff --git a/lib/EntoSA/RegionStore.cpp b/lib/StaticAnalyzer/EntoSA/RegionStore.cpp
similarity index 99%
rename from lib/EntoSA/RegionStore.cpp
rename to lib/StaticAnalyzer/EntoSA/RegionStore.cpp
index 49795c6..def1b43 100644
--- a/lib/EntoSA/RegionStore.cpp
+++ b/lib/StaticAnalyzer/EntoSA/RegionStore.cpp
@@ -20,9 +20,9 @@
#include "clang/Analysis/Analyses/LiveVariables.h"
#include "clang/Analysis/AnalysisContext.h"
#include "clang/Basic/TargetInfo.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
-#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
-#include "clang/EntoSA/PathSensitive/MemRegion.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/MemRegion.h"
#include "llvm/ADT/ImmutableList.h"
#include "llvm/ADT/ImmutableMap.h"
#include "llvm/ADT/Optional.h"
diff --git a/lib/EntoSA/SValBuilder.cpp b/lib/StaticAnalyzer/EntoSA/SValBuilder.cpp
similarity index 96%
rename from lib/EntoSA/SValBuilder.cpp
rename to lib/StaticAnalyzer/EntoSA/SValBuilder.cpp
index c4efaae..f87fb7e 100644
--- a/lib/EntoSA/SValBuilder.cpp
+++ b/lib/StaticAnalyzer/EntoSA/SValBuilder.cpp
@@ -12,11 +12,11 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/MemRegion.h"
-#include "clang/EntoSA/PathSensitive/SVals.h"
-#include "clang/EntoSA/PathSensitive/SValBuilder.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
-#include "clang/EntoSA/PathSensitive/BasicValueFactory.h"
+#include "clang/StaticAnalyzer/PathSensitive/MemRegion.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/SValBuilder.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/BasicValueFactory.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/SVals.cpp b/lib/StaticAnalyzer/EntoSA/SVals.cpp
similarity index 99%
rename from lib/EntoSA/SVals.cpp
rename to lib/StaticAnalyzer/EntoSA/SVals.cpp
index ea23293..dd8508a 100644
--- a/lib/EntoSA/SVals.cpp
+++ b/lib/StaticAnalyzer/EntoSA/SVals.cpp
@@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
#include "clang/Basic/IdentifierTable.h"
using namespace clang;
diff --git a/lib/EntoSA/SimpleConstraintManager.cpp b/lib/StaticAnalyzer/EntoSA/SimpleConstraintManager.cpp
similarity index 97%
rename from lib/EntoSA/SimpleConstraintManager.cpp
rename to lib/StaticAnalyzer/EntoSA/SimpleConstraintManager.cpp
index ef26fc5..e54d0ff 100644
--- a/lib/EntoSA/SimpleConstraintManager.cpp
+++ b/lib/StaticAnalyzer/EntoSA/SimpleConstraintManager.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "SimpleConstraintManager.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
-#include "clang/EntoSA/PathSensitive/Checker.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
namespace clang {
diff --git a/lib/EntoSA/SimpleConstraintManager.h b/lib/StaticAnalyzer/EntoSA/SimpleConstraintManager.h
similarity index 96%
rename from lib/EntoSA/SimpleConstraintManager.h
rename to lib/StaticAnalyzer/EntoSA/SimpleConstraintManager.h
index 83db8cc..75f67f7 100644
--- a/lib/EntoSA/SimpleConstraintManager.h
+++ b/lib/StaticAnalyzer/EntoSA/SimpleConstraintManager.h
@@ -14,8 +14,8 @@
#ifndef LLVM_CLANG_GR_SIMPLE_CONSTRAINT_MANAGER_H
#define LLVM_CLANG_GR_SIMPLE_CONSTRAINT_MANAGER_H
-#include "clang/EntoSA/PathSensitive/ConstraintManager.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/ConstraintManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
namespace clang {
diff --git a/lib/EntoSA/SimpleSValBuilder.cpp b/lib/StaticAnalyzer/EntoSA/SimpleSValBuilder.cpp
similarity index 99%
rename from lib/EntoSA/SimpleSValBuilder.cpp
rename to lib/StaticAnalyzer/EntoSA/SimpleSValBuilder.cpp
index ac0bfa6..f1a9074 100644
--- a/lib/EntoSA/SimpleSValBuilder.cpp
+++ b/lib/StaticAnalyzer/EntoSA/SimpleSValBuilder.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/SValBuilder.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/SValBuilder.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Store.cpp b/lib/StaticAnalyzer/EntoSA/Store.cpp
similarity index 98%
rename from lib/EntoSA/Store.cpp
rename to lib/StaticAnalyzer/EntoSA/Store.cpp
index 29b0ee1..f1b8338 100644
--- a/lib/EntoSA/Store.cpp
+++ b/lib/StaticAnalyzer/EntoSA/Store.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/Store.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/Store.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
#include "clang/AST/CharUnits.h"
using namespace clang;
diff --git a/lib/EntoSA/SymbolManager.cpp b/lib/StaticAnalyzer/EntoSA/SymbolManager.cpp
similarity index 98%
rename from lib/EntoSA/SymbolManager.cpp
rename to lib/StaticAnalyzer/EntoSA/SymbolManager.cpp
index 75e0774..08677da 100644
--- a/lib/EntoSA/SymbolManager.cpp
+++ b/lib/StaticAnalyzer/EntoSA/SymbolManager.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/SymbolManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/SymbolManager.h"
#include "clang/Analysis/Analyses/LiveVariables.h"
-#include "clang/EntoSA/PathSensitive/MemRegion.h"
+#include "clang/StaticAnalyzer/PathSensitive/MemRegion.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/lib/EntoSA/TextPathDiagnostics.cpp b/lib/StaticAnalyzer/EntoSA/TextPathDiagnostics.cpp
similarity index 94%
rename from lib/EntoSA/TextPathDiagnostics.cpp
rename to lib/StaticAnalyzer/EntoSA/TextPathDiagnostics.cpp
index bf98301..9ca378f 100644
--- a/lib/EntoSA/TextPathDiagnostics.cpp
+++ b/lib/StaticAnalyzer/EntoSA/TextPathDiagnostics.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathDiagnosticClients.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/PathDiagnosticClients.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
#include "clang/Lex/Preprocessor.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/lib/EntoSA/Environment.cpp b/lib/StaticAnalyzer/Environment.cpp
similarity index 98%
copy from lib/EntoSA/Environment.cpp
copy to lib/StaticAnalyzer/Environment.cpp
index eecbabb..1c74352 100644
--- a/lib/EntoSA/Environment.cpp
+++ b/lib/StaticAnalyzer/Environment.cpp
@@ -13,7 +13,7 @@
#include "clang/Analysis/AnalysisContext.h"
#include "clang/Analysis/CFG.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/ExplodedGraph.cpp b/lib/StaticAnalyzer/ExplodedGraph.cpp
similarity index 98%
copy from lib/EntoSA/ExplodedGraph.cpp
copy to lib/StaticAnalyzer/ExplodedGraph.cpp
index ec66ba6..4c4612f 100644
--- a/lib/EntoSA/ExplodedGraph.cpp
+++ b/lib/StaticAnalyzer/ExplodedGraph.cpp
@@ -12,8 +12,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/ExplodedGraph.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExplodedGraph.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
#include "clang/AST/Stmt.h"
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/DenseMap.h"
diff --git a/lib/EntoSA/FlatStore.cpp b/lib/StaticAnalyzer/FlatStore.cpp
similarity index 98%
copy from lib/EntoSA/FlatStore.cpp
copy to lib/StaticAnalyzer/FlatStore.cpp
index 8ded4d1..1558db7 100644
--- a/lib/EntoSA/FlatStore.cpp
+++ b/lib/StaticAnalyzer/FlatStore.cpp
@@ -7,7 +7,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
#include "llvm/ADT/ImmutableIntervalMap.h"
#include "llvm/Support/ErrorHandling.h"
diff --git a/lib/EntoSA/GRState.cpp b/lib/StaticAnalyzer/GRState.cpp
similarity index 98%
copy from lib/EntoSA/GRState.cpp
copy to lib/StaticAnalyzer/GRState.cpp
index 6239623..12c8968 100644
--- a/lib/EntoSA/GRState.cpp
+++ b/lib/StaticAnalyzer/GRState.cpp
@@ -12,10 +12,10 @@
//===----------------------------------------------------------------------===//
#include "clang/Analysis/CFG.h"
-#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
-#include "clang/EntoSA/PathSensitive/SubEngine.h"
-#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/SubEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/TransferFuncs.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/lib/EntoSA/HTMLDiagnostics.cpp b/lib/StaticAnalyzer/HTMLDiagnostics.cpp
similarity index 98%
copy from lib/EntoSA/HTMLDiagnostics.cpp
copy to lib/StaticAnalyzer/HTMLDiagnostics.cpp
index a0d338a..659c32d 100644
--- a/lib/EntoSA/HTMLDiagnostics.cpp
+++ b/lib/StaticAnalyzer/HTMLDiagnostics.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathDiagnosticClients.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/PathDiagnosticClients.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
#include "clang/AST/ASTContext.h"
#include "clang/AST/Decl.h"
#include "clang/Basic/SourceManager.h"
diff --git a/lib/EntoSA/Makefile b/lib/StaticAnalyzer/Makefile
similarity index 93%
copy from lib/EntoSA/Makefile
copy to lib/StaticAnalyzer/Makefile
index 9678138..08ace28 100644
--- a/lib/EntoSA/Makefile
+++ b/lib/StaticAnalyzer/Makefile
@@ -12,7 +12,7 @@
##===----------------------------------------------------------------------===##
CLANG_LEVEL := ../..
-LIBRARYNAME := clangEntoCore
+LIBRARYNAME := clangStaticAnalyzerCore
PARALLEL_DIRS := Checkers
include $(CLANG_LEVEL)/Makefile
diff --git a/lib/EntoSA/ManagerRegistry.cpp b/lib/StaticAnalyzer/ManagerRegistry.cpp
similarity index 92%
copy from lib/EntoSA/ManagerRegistry.cpp
copy to lib/StaticAnalyzer/ManagerRegistry.cpp
index 99b7a70..3f9ed61 100644
--- a/lib/EntoSA/ManagerRegistry.cpp
+++ b/lib/StaticAnalyzer/ManagerRegistry.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/ManagerRegistry.h"
+#include "clang/StaticAnalyzer/ManagerRegistry.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/MemRegion.cpp b/lib/StaticAnalyzer/MemRegion.cpp
similarity index 99%
copy from lib/EntoSA/MemRegion.cpp
copy to lib/StaticAnalyzer/MemRegion.cpp
index ff0f340..e465224 100644
--- a/lib/EntoSA/MemRegion.cpp
+++ b/lib/StaticAnalyzer/MemRegion.cpp
@@ -13,8 +13,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/MemRegion.h"
-#include "clang/EntoSA/PathSensitive/SValBuilder.h"
+#include "clang/StaticAnalyzer/PathSensitive/MemRegion.h"
+#include "clang/StaticAnalyzer/PathSensitive/SValBuilder.h"
#include "clang/Analysis/AnalysisContext.h"
#include "clang/Analysis/Support/BumpVector.h"
#include "clang/AST/CharUnits.h"
diff --git a/lib/EntoSA/PathDiagnostic.cpp b/lib/StaticAnalyzer/PathDiagnostic.cpp
similarity index 98%
copy from lib/EntoSA/PathDiagnostic.cpp
copy to lib/StaticAnalyzer/PathDiagnostic.cpp
index bf8c8b0..f05dec8 100644
--- a/lib/EntoSA/PathDiagnostic.cpp
+++ b/lib/StaticAnalyzer/PathDiagnostic.cpp
@@ -11,7 +11,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
#include "clang/AST/Expr.h"
#include "clang/AST/Decl.h"
#include "clang/AST/DeclObjC.h"
diff --git a/lib/EntoSA/PlistDiagnostics.cpp b/lib/StaticAnalyzer/PlistDiagnostics.cpp
similarity index 98%
copy from lib/EntoSA/PlistDiagnostics.cpp
copy to lib/StaticAnalyzer/PlistDiagnostics.cpp
index 6e54d49..ecc0cff 100644
--- a/lib/EntoSA/PlistDiagnostics.cpp
+++ b/lib/StaticAnalyzer/PlistDiagnostics.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathDiagnosticClients.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/PathDiagnosticClients.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
#include "clang/Basic/SourceManager.h"
#include "clang/Basic/FileManager.h"
#include "clang/Lex/Preprocessor.h"
diff --git a/lib/EntoSA/README.txt b/lib/StaticAnalyzer/README.txt
similarity index 100%
copy from lib/EntoSA/README.txt
copy to lib/StaticAnalyzer/README.txt
diff --git a/lib/EntoSA/RangeConstraintManager.cpp b/lib/StaticAnalyzer/RangeConstraintManager.cpp
similarity index 98%
copy from lib/EntoSA/RangeConstraintManager.cpp
copy to lib/StaticAnalyzer/RangeConstraintManager.cpp
index 5c2d674..c89fa50 100644
--- a/lib/EntoSA/RangeConstraintManager.cpp
+++ b/lib/StaticAnalyzer/RangeConstraintManager.cpp
@@ -13,10 +13,10 @@
//===----------------------------------------------------------------------===//
#include "SimpleConstraintManager.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
-#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
-#include "clang/EntoSA/PathSensitive/TransferFuncs.h"
-#include "clang/EntoSA/ManagerRegistry.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/TransferFuncs.h"
+#include "clang/StaticAnalyzer/ManagerRegistry.h"
#include "llvm/Support/Debug.h"
#include "llvm/ADT/FoldingSet.h"
#include "llvm/ADT/ImmutableSet.h"
diff --git a/lib/EntoSA/RegionStore.cpp b/lib/StaticAnalyzer/RegionStore.cpp
similarity index 99%
copy from lib/EntoSA/RegionStore.cpp
copy to lib/StaticAnalyzer/RegionStore.cpp
index 49795c6..def1b43 100644
--- a/lib/EntoSA/RegionStore.cpp
+++ b/lib/StaticAnalyzer/RegionStore.cpp
@@ -20,9 +20,9 @@
#include "clang/Analysis/Analyses/LiveVariables.h"
#include "clang/Analysis/AnalysisContext.h"
#include "clang/Basic/TargetInfo.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
-#include "clang/EntoSA/PathSensitive/GRStateTrait.h"
-#include "clang/EntoSA/PathSensitive/MemRegion.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRStateTrait.h"
+#include "clang/StaticAnalyzer/PathSensitive/MemRegion.h"
#include "llvm/ADT/ImmutableList.h"
#include "llvm/ADT/ImmutableMap.h"
#include "llvm/ADT/Optional.h"
diff --git a/lib/EntoSA/SValBuilder.cpp b/lib/StaticAnalyzer/SValBuilder.cpp
similarity index 96%
copy from lib/EntoSA/SValBuilder.cpp
copy to lib/StaticAnalyzer/SValBuilder.cpp
index c4efaae..f87fb7e 100644
--- a/lib/EntoSA/SValBuilder.cpp
+++ b/lib/StaticAnalyzer/SValBuilder.cpp
@@ -12,11 +12,11 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/MemRegion.h"
-#include "clang/EntoSA/PathSensitive/SVals.h"
-#include "clang/EntoSA/PathSensitive/SValBuilder.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
-#include "clang/EntoSA/PathSensitive/BasicValueFactory.h"
+#include "clang/StaticAnalyzer/PathSensitive/MemRegion.h"
+#include "clang/StaticAnalyzer/PathSensitive/SVals.h"
+#include "clang/StaticAnalyzer/PathSensitive/SValBuilder.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/BasicValueFactory.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/SVals.cpp b/lib/StaticAnalyzer/SVals.cpp
similarity index 99%
copy from lib/EntoSA/SVals.cpp
copy to lib/StaticAnalyzer/SVals.cpp
index ea23293..dd8508a 100644
--- a/lib/EntoSA/SVals.cpp
+++ b/lib/StaticAnalyzer/SVals.cpp
@@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
#include "clang/Basic/IdentifierTable.h"
using namespace clang;
diff --git a/lib/EntoSA/SimpleConstraintManager.cpp b/lib/StaticAnalyzer/SimpleConstraintManager.cpp
similarity index 97%
copy from lib/EntoSA/SimpleConstraintManager.cpp
copy to lib/StaticAnalyzer/SimpleConstraintManager.cpp
index ef26fc5..e54d0ff 100644
--- a/lib/EntoSA/SimpleConstraintManager.cpp
+++ b/lib/StaticAnalyzer/SimpleConstraintManager.cpp
@@ -13,9 +13,9 @@
//===----------------------------------------------------------------------===//
#include "SimpleConstraintManager.h"
-#include "clang/EntoSA/PathSensitive/ExprEngine.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
-#include "clang/EntoSA/PathSensitive/Checker.h"
+#include "clang/StaticAnalyzer/PathSensitive/ExprEngine.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/Checker.h"
namespace clang {
diff --git a/lib/EntoSA/SimpleConstraintManager.h b/lib/StaticAnalyzer/SimpleConstraintManager.h
similarity index 96%
copy from lib/EntoSA/SimpleConstraintManager.h
copy to lib/StaticAnalyzer/SimpleConstraintManager.h
index 83db8cc..75f67f7 100644
--- a/lib/EntoSA/SimpleConstraintManager.h
+++ b/lib/StaticAnalyzer/SimpleConstraintManager.h
@@ -14,8 +14,8 @@
#ifndef LLVM_CLANG_GR_SIMPLE_CONSTRAINT_MANAGER_H
#define LLVM_CLANG_GR_SIMPLE_CONSTRAINT_MANAGER_H
-#include "clang/EntoSA/PathSensitive/ConstraintManager.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/ConstraintManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
namespace clang {
diff --git a/lib/EntoSA/SimpleSValBuilder.cpp b/lib/StaticAnalyzer/SimpleSValBuilder.cpp
similarity index 99%
copy from lib/EntoSA/SimpleSValBuilder.cpp
copy to lib/StaticAnalyzer/SimpleSValBuilder.cpp
index ac0bfa6..f1a9074 100644
--- a/lib/EntoSA/SimpleSValBuilder.cpp
+++ b/lib/StaticAnalyzer/SimpleSValBuilder.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/SValBuilder.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/SValBuilder.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
using namespace clang;
using namespace ento;
diff --git a/lib/EntoSA/Store.cpp b/lib/StaticAnalyzer/Store.cpp
similarity index 98%
copy from lib/EntoSA/Store.cpp
copy to lib/StaticAnalyzer/Store.cpp
index 29b0ee1..f1b8338 100644
--- a/lib/EntoSA/Store.cpp
+++ b/lib/StaticAnalyzer/Store.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/Store.h"
-#include "clang/EntoSA/PathSensitive/GRState.h"
+#include "clang/StaticAnalyzer/PathSensitive/Store.h"
+#include "clang/StaticAnalyzer/PathSensitive/GRState.h"
#include "clang/AST/CharUnits.h"
using namespace clang;
diff --git a/lib/EntoSA/SymbolManager.cpp b/lib/StaticAnalyzer/SymbolManager.cpp
similarity index 98%
copy from lib/EntoSA/SymbolManager.cpp
copy to lib/StaticAnalyzer/SymbolManager.cpp
index 75e0774..08677da 100644
--- a/lib/EntoSA/SymbolManager.cpp
+++ b/lib/StaticAnalyzer/SymbolManager.cpp
@@ -12,9 +12,9 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathSensitive/SymbolManager.h"
+#include "clang/StaticAnalyzer/PathSensitive/SymbolManager.h"
#include "clang/Analysis/Analyses/LiveVariables.h"
-#include "clang/EntoSA/PathSensitive/MemRegion.h"
+#include "clang/StaticAnalyzer/PathSensitive/MemRegion.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/lib/EntoSA/TextPathDiagnostics.cpp b/lib/StaticAnalyzer/TextPathDiagnostics.cpp
similarity index 94%
copy from lib/EntoSA/TextPathDiagnostics.cpp
copy to lib/StaticAnalyzer/TextPathDiagnostics.cpp
index bf98301..9ca378f 100644
--- a/lib/EntoSA/TextPathDiagnostics.cpp
+++ b/lib/StaticAnalyzer/TextPathDiagnostics.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "clang/EntoSA/PathDiagnosticClients.h"
-#include "clang/EntoSA/BugReporter/PathDiagnostic.h"
+#include "clang/StaticAnalyzer/PathDiagnosticClients.h"
+#include "clang/StaticAnalyzer/BugReporter/PathDiagnostic.h"
#include "clang/Lex/Preprocessor.h"
#include "llvm/Support/raw_ostream.h"
using namespace clang;
diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt
index 6e02e85..14c06c0 100644
--- a/tools/driver/CMakeLists.txt
+++ b/tools/driver/CMakeLists.txt
@@ -8,8 +8,8 @@
clangCodeGen
clangParse
clangSema
- clangEntoCheckers
- clangEntoCore
+ clangStaticAnalyzerCheckers
+ clangStaticAnalyzerCore
clangAnalysis
clangIndex
clangRewrite
diff --git a/tools/driver/Makefile b/tools/driver/Makefile
index e97bfeb..9942310 100644
--- a/tools/driver/Makefile
+++ b/tools/driver/Makefile
@@ -39,7 +39,7 @@
ipo selectiondag
USEDLIBS = clangFrontendTool.a clangFrontend.a clangDriver.a \
clangSerialization.a clangCodeGen.a clangParse.a clangSema.a \
- clangEntoCheckers.a clangEntoCore.a clangAnalysis.a clangIndex.a clangRewrite.a \
+ clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a clangAnalysis.a clangIndex.a clangRewrite.a \
clangAST.a clangLex.a clangBasic.a
include $(CLANG_LEVEL)/Makefile