diff --git a/clang/examples/PrintFunctionNames/CMakeLists.txt b/clang/examples/PrintFunctionNames/CMakeLists.txt index d442ff9c6b3e..58b4603e9b6d 100644 --- a/clang/examples/PrintFunctionNames/CMakeLists.txt +++ b/clang/examples/PrintFunctionNames/CMakeLists.txt @@ -8,6 +8,7 @@ set( LLVM_USED_LIBS clangCodeGen clangParse clangSema + clangStaticAnalyzerFrontend clangStaticAnalyzerCheckers clangStaticAnalyzerCore clangAnalysis diff --git a/clang/examples/clang-interpreter/CMakeLists.txt b/clang/examples/clang-interpreter/CMakeLists.txt index c8e907eeaa4e..a747b92a76cb 100644 --- a/clang/examples/clang-interpreter/CMakeLists.txt +++ b/clang/examples/clang-interpreter/CMakeLists.txt @@ -4,6 +4,7 @@ set(LLVM_USED_LIBS clangDriver clangCodeGen clangSema + clangStaticAnalyzerFrontend clangStaticAnalyzerCheckers clangStaticAnalyzerCore clangIndex diff --git a/clang/examples/clang-interpreter/Makefile b/clang/examples/clang-interpreter/Makefile index 24a2be864d05..6e762da708d2 100644 --- a/clang/examples/clang-interpreter/Makefile +++ b/clang/examples/clang-interpreter/Makefile @@ -18,7 +18,7 @@ TOOL_NO_EXPORTS = 1 LINK_COMPONENTS := jit interpreter nativecodegen bitreader bitwriter ipo \ selectiondag asmparser USEDLIBS = clangFrontend.a clangSerialization.a clangDriver.a clangCodeGen.a \ - clangSema.a clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a clangAnalysis.a clangRewrite.a \ + clangSema.a clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a clangAnalysis.a clangRewrite.a \ clangAST.a clangParse.a clangLex.a clangBasic.a include $(CLANG_LEVEL)/Makefile diff --git a/clang/examples/wpa/CMakeLists.txt b/clang/examples/wpa/CMakeLists.txt index c997c69453f4..ad1bb8e36b0e 100644 --- a/clang/examples/wpa/CMakeLists.txt +++ b/clang/examples/wpa/CMakeLists.txt @@ -5,6 +5,7 @@ set(LLVM_USED_LIBS clangSema clangAnalysis clangSerialization + clangStaticAnalyzerFrontend clangStaticAnalyzerCheckers clangStaticAnalyzerCore clangRewrite diff --git a/clang/examples/wpa/Makefile b/clang/examples/wpa/Makefile index af0f843149cf..2ce2040c87ca 100644 --- a/clang/examples/wpa/Makefile +++ b/clang/examples/wpa/Makefile @@ -16,7 +16,7 @@ NO_INSTALL = 1 TOOL_NO_EXPORTS = 1 LINK_COMPONENTS := asmparser bitreader mc core -USEDLIBS = clangStaticAnalyzerCheckers.a clangStaticAnalyzerCore.a clangIndex.a clangFrontend.a clangDriver.a \ +USEDLIBS = clangStaticAnalyzerFrontend.a 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/clang/lib/FrontendTool/CMakeLists.txt b/clang/lib/FrontendTool/CMakeLists.txt index c367695d572c..720ce2adf123 100644 --- a/clang/lib/FrontendTool/CMakeLists.txt +++ b/clang/lib/FrontendTool/CMakeLists.txt @@ -1,5 +1,5 @@ set(LLVM_USED_LIBS clangDriver clangFrontend clangRewrite clangCodeGen - clangStaticAnalyzerCheckers clangStaticAnalyzerCore) + clangStaticAnalyzerFrontend clangStaticAnalyzerCheckers clangStaticAnalyzerCore) add_clang_library(clangFrontendTool ExecuteCompilerInvocation.cpp diff --git a/clang/lib/StaticAnalyzer/CMakeLists.txt b/clang/lib/StaticAnalyzer/CMakeLists.txt index b2b778a4376a..3d1509254f52 100644 --- a/clang/lib/StaticAnalyzer/CMakeLists.txt +++ b/clang/lib/StaticAnalyzer/CMakeLists.txt @@ -1,2 +1,3 @@ add_subdirectory(Core) add_subdirectory(Checkers) +add_subdirectory(Frontend) diff --git a/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt b/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt index 48e5b6334174..f363cdef8ee4 100644 --- a/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt +++ b/clang/lib/StaticAnalyzer/Checkers/CMakeLists.txt @@ -2,7 +2,6 @@ set(LLVM_USED_LIBS clangBasic clangAST) add_clang_library(clangStaticAnalyzerCheckers AdjustedReturnValueChecker.cpp - AnalysisConsumer.cpp AnalyzerStatsChecker.cpp ArrayBoundChecker.cpp ArrayBoundCheckerV2.cpp diff --git a/clang/lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp b/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp similarity index 99% rename from clang/lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp rename to clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp index 497ae33af016..394280f80cbb 100644 --- a/clang/lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp +++ b/clang/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp @@ -30,8 +30,8 @@ #include "clang/StaticAnalyzer/Core/PathDiagnosticClients.h" // FIXME: Restructure checker registration. -#include "ExperimentalChecks.h" -#include "InternalChecks.h" +#include "../Checkers/ExperimentalChecks.h" +#include "../Checkers/InternalChecks.h" #include "clang/Basic/FileManager.h" #include "clang/Basic/SourceManager.h" diff --git a/clang/lib/StaticAnalyzer/Frontend/CMakeLists.txt b/clang/lib/StaticAnalyzer/Frontend/CMakeLists.txt new file mode 100644 index 000000000000..03b58b1df7f0 --- /dev/null +++ b/clang/lib/StaticAnalyzer/Frontend/CMakeLists.txt @@ -0,0 +1,10 @@ +set(LLVM_NO_RTTI 1) + +set(LLVM_USED_LIBS clangBasic clangLex clangAST clangFrontend clangRewrite) + +add_clang_library(clangStaticAnalyzerFrontend + AnalysisConsumer.cpp + ) + +add_dependencies(clangStaticAnalyzerCheckers clangStaticAnalyzerCore ClangAttrClasses ClangAttrList ClangDeclNodes + ClangStmtNodes) diff --git a/clang/lib/StaticAnalyzer/Frontend/Makefile b/clang/lib/StaticAnalyzer/Frontend/Makefile new file mode 100644 index 000000000000..1e6561e555b5 --- /dev/null +++ b/clang/lib/StaticAnalyzer/Frontend/Makefile @@ -0,0 +1,17 @@ +##===- clang/lib/StaticAnalyzer/Frontend/Makefile ----------*- Makefile -*-===## +# +# The LLVM Compiler Infrastructure +# +# This file is distributed under the University of Illinois Open Source +# License. See LICENSE.TXT for details. +# +##===----------------------------------------------------------------------===## +# +# Starting point into the static analyzer land for the driver. +# +##===----------------------------------------------------------------------===## + +CLANG_LEVEL := ../../.. +LIBRARYNAME := clangStaticAnalyzerFrontend + +include $(CLANG_LEVEL)/Makefile diff --git a/clang/lib/StaticAnalyzer/Makefile b/clang/lib/StaticAnalyzer/Makefile index f762531b8231..a23554de21dc 100644 --- a/clang/lib/StaticAnalyzer/Makefile +++ b/clang/lib/StaticAnalyzer/Makefile @@ -12,6 +12,6 @@ ##===----------------------------------------------------------------------===## CLANG_LEVEL := ../.. -PARALLEL_DIRS := Core Checkers +PARALLEL_DIRS := Core Checkers Frontend include $(CLANG_LEVEL)/Makefile diff --git a/clang/tools/driver/CMakeLists.txt b/clang/tools/driver/CMakeLists.txt index d948eb93f56c..6dc47d656cf9 100644 --- a/clang/tools/driver/CMakeLists.txt +++ b/clang/tools/driver/CMakeLists.txt @@ -12,6 +12,7 @@ set( LLVM_USED_LIBS clangRewrite clangSema clangSerialization + clangStaticAnalyzerFrontend clangStaticAnalyzerCheckers clangStaticAnalyzerCore ) diff --git a/clang/tools/driver/Makefile b/clang/tools/driver/Makefile index c01db5488e6c..d96f9505ffe5 100644 --- a/clang/tools/driver/Makefile +++ b/clang/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 \ + clangStaticAnalyzerFrontend.a clangStaticAnalyzerCheckers.a \ + clangStaticAnalyzerCore.a \ clangAnalysis.a clangIndex.a clangRewrite.a \ clangAST.a clangLex.a clangBasic.a