Szelethus updated this revision to Diff 196083.
Szelethus added a comment.
- Move the existing plugin to `test/`
- Implement the new plugin in there also
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D59464/new/
https://reviews.llvm.org/D59464
Files:
examples/CMakeLists.txt
examples/analyzer-plugin/CMakeLists.txt
examples/analyzer-plugin/MainCallChecker.cpp
examples/analyzer-plugin/SampleAnalyzerPlugin.exports
test/Analysis/checker-plugins.c
test/Analysis/lit.local.cfg
test/Analysis/plugins/CMakeLists.txt
test/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt
test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp
test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandlingAnalyzerPlugin.exports
test/Analysis/plugins/SampleAnalyzer/CMakeLists.txt
test/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp
test/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports
test/CMakeLists.txt
Index: test/CMakeLists.txt
===================================================================
--- test/CMakeLists.txt
+++ test/CMakeLists.txt
@@ -137,13 +137,15 @@
# check-all would launch those tests via check-clang.
set(EXCLUDE_FROM_ALL ON)
+ add_subdirectory(Analysis/plugins)
+ list(APPEND CLANG_TEST_DEPS clang-analyzer-plugin)
+
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
Index: test/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports
===================================================================
--- /dev/null
+++ test/Analysis/plugins/SampleAnalyzer/SampleAnalyzerPlugin.exports
@@ -0,0 +1,2 @@
+clang_registerCheckers
+clang_analyzerAPIVersionString
Index: test/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp
===================================================================
--- test/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp
+++ test/Analysis/plugins/SampleAnalyzer/MainCallChecker.cpp
@@ -1,13 +1,13 @@
-#include "clang/StaticAnalyzer/Core/Checker.h"
#include "clang/StaticAnalyzer/Core/BugReporter/BugType.h"
-#include "clang/StaticAnalyzer/Frontend/CheckerRegistry.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> > {
+class MainCallChecker : public Checker<check::PreStmt<CallExpr>> {
mutable std::unique_ptr<BugType> BT;
public:
@@ -15,7 +15,8 @@
};
} // end anonymous namespace
-void MainCallChecker::checkPreStmt(const CallExpr *CE, CheckerContext &C) const {
+void MainCallChecker::checkPreStmt(const CallExpr *CE,
+ CheckerContext &C) const {
const Expr *Callee = CE->getCallee();
const FunctionDecl *FD = C.getSVal(Callee).getAsFunctionDecl();
@@ -24,7 +25,7 @@
// Get the name of the callee.
IdentifierInfo *II = FD->getIdentifier();
- if (!II) // if no identifier, not a simple C function
+ if (!II) // if no identifier, not a simple C function
return;
if (II->isStr("main")) {
@@ -43,12 +44,11 @@
}
// Register plugin!
-extern "C"
-void clang_registerCheckers (CheckerRegistry ®istry) {
+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;
+extern "C" const char clang_analyzerAPIVersionString[] =
+ CLANG_ANALYZER_API_VERSION_STRING;
Index: test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp
===================================================================
--- /dev/null
+++ test/Analysis/plugins/CheckerDependencyHandling/CheckerDependencyHandling.cpp
@@ -0,0 +1,28 @@
+#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: test/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt
===================================================================
--- /dev/null
+++ test/Analysis/plugins/CheckerDependencyHandling/CMakeLists.txt
@@ -0,0 +1,11 @@
+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()
Index: test/Analysis/plugins/CMakeLists.txt
===================================================================
--- /dev/null
+++ test/Analysis/plugins/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_subdirectory(SampleAnalyzer)
+add_subdirectory(CheckerDependencyHandling)
+
+set(CLANG_ANALYZER_PLUGIN_DEPS
+ SampleAnalyzerPlugin
+ CheckerDependencyHandlingAnalyzerPlugin
+ )
+
+add_custom_target(clang-analyzer-plugin
+ DEPENDS ${CLANG_ANALYZER_PLUGIN_DEPS})
Index: test/Analysis/lit.local.cfg
===================================================================
--- test/Analysis/lit.local.cfg
+++ test/Analysis/lit.local.cfg
@@ -18,5 +18,7 @@
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: test/Analysis/checker-plugins.c
===================================================================
--- test/Analysis/checker-plugins.c
+++ test/Analysis/checker-plugins.c
@@ -1,5 +1,8 @@
-// RUN: %clang_analyze_cc1 -load %llvmshlibdir/SampleAnalyzerPlugin%pluginext -analyzer-checker='example.MainCallChecker' -verify %s
-// REQUIRES: plugins, examples
+// RUN: %clang_analyze_cc1 -verify %s \
+// RUN: -load %llvmshlibdir/SampleAnalyzerPlugin%pluginext \
+// RUN: -analyzer-checker='example.MainCallChecker'
+
+// REQUIRES: plugins
// Test that the MainCallChecker example analyzer plugin loads and runs.
@@ -8,3 +11,22 @@
void caller() {
main(); // expected-warning {{call to main}}
}
+
+// RUN: %clang_analyze_cc1 %s \
+// RUN: -load %llvmshlibdir/CheckerDependencyHandlingAnalyzerPlugin%pluginext\
+// RUN: -analyzer-checker=example.DependendentChecker \
+// RUN: -analyzer-list-enabled-checkers \
+// RUN: 2>&1 | FileCheck %s -check-prefix=CHECK-IMPLICITLY-ENABLED
+
+// CHECK-IMPLICITLY-ENABLED: example.Dependency
+// CHECK-IMPLICITLY-ENABLED: example.DependendentChecker
+
+// RUN: %clang_analyze_cc1 %s \
+// RUN: -load %llvmshlibdir/CheckerDependencyHandlingAnalyzerPlugin%pluginext\
+// RUN: -analyzer-checker=example.DependendentChecker \
+// RUN: -analyzer-disable-checker=example.Dependency \
+// RUN: -analyzer-list-enabled-checkers \
+// RUN: 2>&1 | FileCheck %s -check-prefix=CHECK-IMPLICITLY-DISABLED
+
+// CHECK-IMPLICITLY-DISABLED-NOT: example.Dependency
+// CHECK-IMPLICITLY-DISABLED-NOT: example.DependendentChecker
Index: examples/CMakeLists.txt
===================================================================
--- examples/CMakeLists.txt
+++ examples/CMakeLists.txt
@@ -3,9 +3,6 @@
set(EXCLUDE_FROM_ALL ON)
endif()
-if(CLANG_ENABLE_STATIC_ANALYZER)
-add_subdirectory(analyzer-plugin)
-endif()
add_subdirectory(clang-interpreter)
add_subdirectory(PrintFunctionNames)
add_subdirectory(AnnotateFunctions)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
