Revert r123160. There are linking dependency problems.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@123166 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/StaticAnalyzer/AnalysisConsumer.cpp b/lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp
similarity index 99%
rename from lib/StaticAnalyzer/AnalysisConsumer.cpp
rename to lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp
index f8a23199088863862692af0f0baebd61f5cb7b17..ee4eae2ebfa4a55c9a4b04c85f061bb5313033ad 100644 (file)
--- a/lib/StaticAnalyzer/AnalysisConsumer.cpp
+++ b/lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp
@@ -30,8 +30,8 @@
 #include "clang/StaticAnalyzer/PathDiagnosticClients.h"
 
 // FIXME: Restructure checker registration.
-#include "Checkers/ExprEngineExperimentalChecks.h"
-#include "Checkers/ExprEngineInternalChecks.h"
+#include "ExprEngineExperimentalChecks.h"
+#include "ExprEngineInternalChecks.h"
 
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/SourceManager.h"

diff --git a/lib/StaticAnalyzer/ExprEngine.cpp b/lib/StaticAnalyzer/Checkers/ExprEngine.cpp
similarity index 99%
rename from lib/StaticAnalyzer/ExprEngine.cpp
rename to lib/StaticAnalyzer/Checkers/ExprEngine.cpp
index 0ae02d86e26f57be886efd12109aaf0af8eaee70..ca960142ee35a5c1ff9a249dc4022961a8eff990 100644 (file)
--- a/lib/StaticAnalyzer/ExprEngine.cpp
+++ b/lib/StaticAnalyzer/Checkers/ExprEngine.cpp
@@ -14,7 +14,7 @@
 //===----------------------------------------------------------------------===//
 
 // FIXME: Restructure checker registration.
-#include "Checkers/ExprEngineInternalChecks.h"
+#include "ExprEngineInternalChecks.h"
 
 #include "clang/StaticAnalyzer/BugReporter/BugType.h"
 #include "clang/StaticAnalyzer/PathSensitive/AnalysisManager.h"

diff --git a/tools/driver/Makefile b/tools/driver/Makefile
index 9942310e4ff22e92eda0ef09c0a0128f511f7fc5..c01db5488e6c40dab97f844f01ab7bd309d52ffe 100644 (file)
--- a/tools/driver/Makefile
+++ b/tools/driver/Makefile
@@ -39,7 +39,8 @@ LINK_COMPONENTS := $(TARGETS_TO_BUILD) asmparser bitreader bitwriter codegen \
                    ipo selectiondag
 USEDLIBS = clangFrontendTool.a clangFrontend.a clangDriver.a \
            clangSerialization.a clangCodeGen.a clangParse.a clangSema.a \
-           clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.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