hintonda created this revision.
hintonda added reviewers: beanz, phosek, george.karpenkov, NoQ, ahatanak,
rjmccall.
Herald added subscribers: llvm-commits, dexonsmith, mgorny.
Herald added projects: clang, LLVM.
hintonda edited the summary of this revision.
The following changes were required to fix these tests:
1. Change LLVM_ENABLE_PLUGINS to an option and move it to llvm/CMakeLists.txt
with an appropriate default -- which matches the original default behavior.
2. Move the plugins directory from clang/test/Analysis clang/lib/Analysis.
It's not enough to add an exclude to the lit.local.cfg file because
add_lit_testsuites recurses the tree and automatically adds the appropriate
`check-` targets, which don't make sense for the plugins because they aren't
tests and don't have no `RUN` statements.
Here's a list of the `clang-check-anlysis*` targets with this change:
$ ninja -t targets all| sed -n "s/.*\/\(check[^:]*\):.*/\1/p" | sort -u |
grep clang-analysis
check-clang-analysis
check-clang-analysis-checkers
check-clang-analysis-copypaste
check-clang-analysis-diagnostics
check-clang-analysis-engine
check-clang-analysis-exploration_order
check-clang-analysis-html_diagnostics
check-clang-analysis-html_diagnostics-relevant_lines
check-clang-analysis-inlining
check-clang-analysis-objc
check-clang-analysis-unified-sources
check-clang-analysis-z3
3. Simplify the logic and only include the subdirectories under
clang/lib/Analysis/plugins if LLVM_ENABLE_PLUGINS is set.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D62445
Files:
clang/lib/Analysis/CMakeLists.txt
clang/lib/Analysis/plugins/CMakeLists.txt
clang/lib/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt
clang/lib/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp
clang/lib/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandlingAnalyzerPlugin.exports
clang/lib/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt
clang/lib/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandling.cpp
clang/lib/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandlingAnalyzerPlugin.exports
clang/lib/Analysis/plugins/SampleAnalyzer/CMakeLists.txt
clang/lib/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp
clang/lib/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports
clang/test/Analysis/lit.local.cfg
clang/test/Analysis/plugins/CMakeLists.txt
clang/test/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt
clang/test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp
clang/test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandlingAnalyzerPlugin.exports
clang/test/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt
clang/test/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandling.cpp
clang/test/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandlingAnalyzerPlugin.exports
clang/test/Analysis/plugins/SampleAnalyzer/CMakeLists.txt
clang/test/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp
clang/test/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports
clang/test/CMakeLists.txt
llvm/CMakeLists.txt
llvm/cmake/modules/HandleLLVMOptions.cmake
Index: llvm/cmake/modules/HandleLLVMOptions.cmake
===================================================================
--- llvm/cmake/modules/HandleLLVMOptions.cmake
+++ llvm/cmake/modules/HandleLLVMOptions.cmake
@@ -912,14 +912,6 @@
message(FATAL_ERROR "LLVM_LINK_LLVM_DYLIB not compatible with LLVM_EXPORT_SYMBOLS_FOR_PLUGINS")
endif()
-# Plugin support
-# FIXME: Make this configurable.
-if(BUILD_SHARED_LIBS OR LLVM_BUILD_LLVM_DYLIB)
- set(LLVM_ENABLE_PLUGINS ON)
-else()
- set(LLVM_ENABLE_PLUGINS OFF)
-endif()
-
# By default we should enable LLVM_ENABLE_IDE only for multi-configuration
# generators. This option disables optional build system features that make IDEs
# less usable.
Index: llvm/CMakeLists.txt
===================================================================
--- llvm/CMakeLists.txt
+++ llvm/CMakeLists.txt
@@ -669,6 +669,17 @@
message(STATUS "LLVM host triple: ${LLVM_HOST_TRIPLE}")
message(STATUS "LLVM default target triple: ${LLVM_DEFAULT_TARGET_TRIPLE}")
+if(WIN32 OR CYGWIN)
+ if(BUILD_SHARED_LIBS OR LLVM_BUILD_LLVM_DYLIB)
+ set(LLVM_ENABLE_PLUGINS_default ON)
+ else()
+ set(LLVM_ENABLE_PLUGINS_default OFF)
+ endif()
+else()
+ set(LLVM_ENABLE_PLUGINS_default ON)
+endif()
+option(LLVM_ENABLE_PLUGINS "Enable plugin support" ${LLVM_ENABLE_PLUGINS_default})
+
include(HandleLLVMOptions)
# Verify that we can find a Python 2 interpreter. Python 3 is unsupported.
Index: clang/test/CMakeLists.txt
===================================================================
--- clang/test/CMakeLists.txt
+++ clang/test/CMakeLists.txt
@@ -126,27 +126,13 @@
endif()
if (CLANG_ENABLE_STATIC_ANALYZER)
- add_subdirectory(Analysis/plugins)
- list(APPEND CLANG_TEST_DEPS clang-analyzer-plugin)
-
- # check-all would launch those tests via check-clang.
- set(EXCLUDE_FROM_ALL ON)
-
- add_lit_testsuite(check-clang-analyzer "Running the Clang analyzer tests"
- ${CMAKE_CURRENT_BINARY_DIR}/Analysis
- PARAMS ${ANALYZER_TEST_PARAMS}
- DEPENDS ${CLANG_TEST_DEPS})
- set_target_properties(check-clang-analyzer PROPERTIES FOLDER "Clang tests")
-
- if (LLVM_WITH_Z3)
- add_lit_testsuite(check-clang-analyzer-z3 "Running the Clang analyzer tests, using Z3 as a solver"
- ${CMAKE_CURRENT_BINARY_DIR}/Analysis
- PARAMS ${ANALYZER_TEST_PARAMS_Z3}
- DEPENDS ${CLANG_TEST_DEPS})
- set_target_properties(check-clang-analyzer-z3 PROPERTIES FOLDER "Clang tests")
+ if (LLVM_ENABLE_PLUGINS)
+ set(CLANG_ANALYZER_PLUGIN_DEPS
+ SampleAnalyzerPlugin
+ CheckerDependencyHandlingAnalyzerPlugin
+ CheckerOptionHandlingAnalyzerPlugin
+ )
endif()
-
- set(EXCLUDE_FROM_ALL OFF)
endif()
add_custom_target(clang-test-depends DEPENDS ${CLANG_TEST_DEPS})
Index: clang/test/Analysis/plugins/SampleAnalyzer/CMakeLists.txt
===================================================================
--- clang/test/Analysis/plugins/SampleAnalyzer/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/SampleAnalyzerPlugin.exports)
-add_llvm_library(SampleAnalyzerPlugin MODULE MainCallChecker.cpp PLUGIN_TOOL clang)
-
-if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN))
- target_link_libraries(SampleAnalyzerPlugin PRIVATE
- clangAnalysis
- clangAST
- clangStaticAnalyzerCore
- LLVMSupport
- )
-endif()
Index: clang/test/Analysis/plugins/CMakeLists.txt
===================================================================
--- clang/test/Analysis/plugins/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-add_subdirectory(SampleAnalyzer)
-add_subdirectory(CheckerDependencyHandling)
-add_subdirectory(CheckerOptionHandling)
-
-set(CLANG_ANALYZER_PLUGIN_DEPS
- SampleAnalyzerPlugin
- CheckerDependencyHandlingAnalyzerPlugin
- CheckerOptionHandlingAnalyzerPlugin
- )
-
-add_custom_target(clang-analyzer-plugin
- DEPENDS ${CLANG_ANALYZER_PLUGIN_DEPS})
Index: clang/test/Analysis/lit.local.cfg
===================================================================
--- clang/test/Analysis/lit.local.cfg
+++ clang/test/Analysis/lit.local.cfg
@@ -18,7 +18,5 @@
config.substitutions.append(('%diff_sarif',
'''diff -U1 -w -I ".*file:.*%basename_t" -I '"version":' -I "2\.0\.0\-csd\.[0-9]*\.beta\."'''))
-config.excludes.add('plugins')
-
if not config.root.clang_staticanalyzer:
config.unsupported = True
Index: clang/test/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports
===================================================================
--- /dev/null
+++ clang/test/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports
@@ -1,2 +0,0 @@
-clang_registerCheckers
-clang_analyzerAPIVersionString
Index: clang/test/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp
===================================================================
--- /dev/null
+++ clang/test/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp
@@ -1,54 +0,0 @@
-#include "clang/StaticAnalyzer/Core/BugReporter/BugType.h"
-#include "clang/StaticAnalyzer/Core/Checker.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h"
-#include "clang/StaticAnalyzer/Frontend/CheckerRegistry.h"
-
-using namespace clang;
-using namespace ento;
-
-namespace {
-class MainCallChecker : public Checker<check::PreStmt<CallExpr>> {
- mutable std::unique_ptr<BugType> BT;
-
-public:
- void checkPreStmt(const CallExpr *CE, CheckerContext &C) const;
-};
-} // end anonymous namespace
-
-void MainCallChecker::checkPreStmt(const CallExpr *CE,
- CheckerContext &C) const {
- const Expr *Callee = CE->getCallee();
- const FunctionDecl *FD = C.getSVal(Callee).getAsFunctionDecl();
-
- if (!FD)
- return;
-
- // Get the name of the callee.
- IdentifierInfo *II = FD->getIdentifier();
- if (!II) // if no identifier, not a simple C function
- return;
-
- if (II->isStr("main")) {
- ExplodedNode *N = C.generateErrorNode();
- if (!N)
- return;
-
- if (!BT)
- BT.reset(new BugType(this, "call to main", "example analyzer plugin"));
-
- std::unique_ptr<BugReport> report =
- llvm::make_unique<BugReport>(*BT, BT->getName(), N);
- report->addRange(Callee->getSourceRange());
- C.emitReport(std::move(report));
- }
-}
-
-// Register plugin!
-extern "C" void clang_registerCheckers(CheckerRegistry ®istry) {
- registry.addChecker<MainCallChecker>(
- "example.MainCallChecker", "Disallows calls to functions called main",
- "");
-}
-
-extern "C" const char clang_analyzerAPIVersionString[] =
- CLANG_ANALYZER_API_VERSION_STRING;
Index: clang/lib/Analysis/plugins/SampleAnalyzer/CMakeLists.txt
===================================================================
--- /dev/null
+++ clang/lib/Analysis/plugins/SampleAnalyzer/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/SampleAnalyzerPlugin.exports)
+add_llvm_library(SampleAnalyzerPlugin MODULE MainCallChecker.cpp PLUGIN_TOOL clang)
+
+target_link_libraries(SampleAnalyzerPlugin PRIVATE
+ clangAnalysis
+ clangAST
+ clangStaticAnalyzerCore
+ clangStaticAnalyzerFrontend
+ LLVMSupport
+ )
Index: clang/test/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandlingAnalyzerPlugin.exports
===================================================================
--- /dev/null
+++ clang/test/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandlingAnalyzerPlugin.exports
@@ -1,2 +0,0 @@
-clang_registerCheckers
-clang_analyzerAPIVersionString
Index: clang/test/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandling.cpp
===================================================================
--- /dev/null
+++ clang/test/Analysis/plugins/CheckerOptionHandling/CheckerOptionHandling.cpp
@@ -1,44 +0,0 @@
-#include "clang/StaticAnalyzer/Core/BugReporter/BugType.h"
-#include "clang/StaticAnalyzer/Core/Checker.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h"
-#include "clang/StaticAnalyzer/Frontend/CheckerRegistry.h"
-
-using namespace clang;
-using namespace ento;
-
-namespace {
-struct MyChecker : public Checker<check::BeginFunction> {
- void checkBeginFunction(CheckerContext &Ctx) const {}
-};
-
-void registerMyChecker(CheckerManager &Mgr) {
- MyChecker *Checker = Mgr.registerChecker<MyChecker>();
- llvm::outs() << "Example option is set to "
- << (Mgr.getAnalyzerOptions().getCheckerBooleanOption(
- Checker, "ExampleOption")
- ? "true"
- : "false")
- << '\n';
-}
-
-bool shouldRegisterMyChecker(const LangOptions &LO) { return true; }
-
-} // end anonymous namespace
-
-// Register plugin!
-extern "C" void clang_registerCheckers(CheckerRegistry ®istry) {
- registry.addChecker(registerMyChecker, shouldRegisterMyChecker,
- "example.MyChecker", "Example Description",
- "example.mychecker.documentation.nonexistent.html",
- /*isHidden*/false);
-
- registry.addCheckerOption(/*OptionType*/ "bool",
- /*CheckerFullName*/ "example.MyChecker",
- /*OptionName*/ "ExampleOption",
- /*DefaultValStr*/ "false",
- /*Description*/ "This is an example checker opt.",
- /*DevelopmentStage*/ "released");
-}
-
-extern "C" const char clang_analyzerAPIVersionString[] =
- CLANG_ANALYZER_API_VERSION_STRING;
Index: clang/lib/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt
===================================================================
--- clang/lib/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt
+++ clang/lib/Analysis/plugins/CheckerOptionHandling/CMakeLists.txt
@@ -1,11 +1,10 @@
set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CheckerOptionHandlingAnalyzerPlugin.exports)
add_llvm_library(CheckerOptionHandlingAnalyzerPlugin MODULE CheckerOptionHandling.cpp PLUGIN_TOOL clang)
-if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN))
- target_link_libraries(CheckerOptionHandlingAnalyzerPlugin PRIVATE
- clangAnalysis
- clangAST
- clangStaticAnalyzerCore
- LLVMSupport
- )
-endif()
+target_link_libraries(CheckerOptionHandlingAnalyzerPlugin PRIVATE
+ clangAnalysis
+ clangAST
+ clangStaticAnalyzerCore
+ clangStaticAnalyzerFrontend
+ LLVMSupport
+ )
Index: clang/test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandlingAnalyzerPlugin.exports
===================================================================
--- /dev/null
+++ clang/test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandlingAnalyzerPlugin.exports
@@ -1,2 +0,0 @@
-clang_registerCheckers
-clang_analyzerAPIVersionString
Index: clang/test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp
===================================================================
--- /dev/null
+++ clang/test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp
@@ -1,28 +0,0 @@
-#include "clang/StaticAnalyzer/Core/BugReporter/BugType.h"
-#include "clang/StaticAnalyzer/Core/Checker.h"
-#include "clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h"
-#include "clang/StaticAnalyzer/Frontend/CheckerRegistry.h"
-
-using namespace clang;
-using namespace ento;
-
-namespace {
-struct Dependency : public Checker<check::BeginFunction> {
- void checkBeginFunction(CheckerContext &Ctx) const {}
-};
-struct DependendentChecker : public Checker<check::BeginFunction> {
- void checkBeginFunction(CheckerContext &Ctx) const {}
-};
-} // end anonymous namespace
-
-// Register plugin!
-extern "C" void clang_registerCheckers(CheckerRegistry ®istry) {
- registry.addChecker<Dependency>("example.Dependency", "", "");
- registry.addChecker<DependendentChecker>("example.DependendentChecker", "",
- "");
-
- registry.addDependency("example.DependendentChecker", "example.Dependency");
-}
-
-extern "C" const char clang_analyzerAPIVersionString[] =
- CLANG_ANALYZER_API_VERSION_STRING;
Index: clang/lib/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt
===================================================================
--- clang/lib/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt
+++ clang/lib/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt
@@ -1,11 +1,10 @@
set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CheckerDependencyHandlingAnalyzerPlugin.exports)
add_llvm_library(CheckerDependencyHandlingAnalyzerPlugin MODULE CheckerDependencyHandling.cpp PLUGIN_TOOL clang)
-if(LLVM_ENABLE_PLUGINS AND (WIN32 OR CYGWIN))
- target_link_libraries(CheckerDependencyHandlingAnalyzerPlugin PRIVATE
- clangAnalysis
- clangAST
- clangStaticAnalyzerCore
- LLVMSupport
- )
-endif()
+target_link_libraries(CheckerDependencyHandlingAnalyzerPlugin PRIVATE
+ clangAnalysis
+ clangAST
+ clangStaticAnalyzerCore
+ clangStaticAnalyzerFrontend
+ LLVMSupport
+ )
Index: clang/lib/Analysis/plugins/CMakeLists.txt
===================================================================
--- /dev/null
+++ clang/lib/Analysis/plugins/CMakeLists.txt
@@ -0,0 +1,5 @@
+if(LLVM_ENABLE_PLUGINS)
+ add_subdirectory(SampleAnalyzer)
+ add_subdirectory(CheckerDependencyHandling)
+ add_subdirectory(CheckerOptionHandling)
+endif()
Index: clang/lib/Analysis/CMakeLists.txt
===================================================================
--- clang/lib/Analysis/CMakeLists.txt
+++ clang/lib/Analysis/CMakeLists.txt
@@ -34,3 +34,5 @@
clangBasic
clangLex
)
+
+add_subdirectory(plugins)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
