r183399 - Add support for static analysis to clang-check
Pavel Labath
labath at google.com
Thu Jun 6 05:35:43 PDT 2013
Author: labath
Date: Thu Jun 6 07:35:43 2013
New Revision: 183399
URL: http://llvm.org/viewvc/llvm-project?rev=183399&view=rev
Log:
Add support for static analysis to clang-check
Summary:
This adds a command line argument '-analyze' to clang-check which runs the
clang static analyzer on the source files.
Reviewers: klimek
CC: cfe-commits, revane
Differential Revision: http://llvm-reviews.chandlerc.com/D926
Added:
cfe/trunk/test/Tooling/clang-check-analyzer.cpp
Modified:
cfe/trunk/tools/clang-check/CMakeLists.txt
cfe/trunk/tools/clang-check/ClangCheck.cpp
Added: cfe/trunk/test/Tooling/clang-check-analyzer.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Tooling/clang-check-analyzer.cpp?rev=183399&view=auto
==============================================================================
--- cfe/trunk/test/Tooling/clang-check-analyzer.cpp (added)
+++ cfe/trunk/test/Tooling/clang-check-analyzer.cpp Thu Jun 6 07:35:43 2013
@@ -0,0 +1,4 @@
+// RUN: clang-check -analyze "%s" -- -c 2>&1 | FileCheck %s
+
+// CHECK: Dereference of null pointer
+int a(int *x) { if(x){} *x = 47; }
Modified: cfe/trunk/tools/clang-check/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-check/CMakeLists.txt?rev=183399&r1=183398&r2=183399&view=diff
==============================================================================
--- cfe/trunk/tools/clang-check/CMakeLists.txt (original)
+++ cfe/trunk/tools/clang-check/CMakeLists.txt Thu Jun 6 07:35:43 2013
@@ -14,6 +14,7 @@ target_link_libraries(clang-check
clangTooling
clangBasic
clangRewriteFrontend
+ clangStaticAnalyzerFrontend
)
install(TARGETS clang-check
Modified: cfe/trunk/tools/clang-check/ClangCheck.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-check/ClangCheck.cpp?rev=183399&r1=183398&r2=183399&view=diff
==============================================================================
--- cfe/trunk/tools/clang-check/ClangCheck.cpp (original)
+++ cfe/trunk/tools/clang-check/ClangCheck.cpp Thu Jun 6 07:35:43 2013
@@ -21,6 +21,7 @@
#include "clang/Driver/Options.h"
#include "clang/Frontend/ASTConsumers.h"
#include "clang/Frontend/CompilerInstance.h"
+#include "clang/StaticAnalyzer/Frontend/FrontendActions.h"
#include "clang/Rewrite/Frontend/FixItRewriter.h"
#include "clang/Rewrite/Frontend/FrontendActions.h"
#include "clang/Tooling/CommonOptionsParser.h"
@@ -62,6 +63,9 @@ static cl::opt<bool> ASTPrint(
static cl::opt<std::string> ASTDumpFilter(
"ast-dump-filter",
cl::desc(Options->getOptionHelpText(options::OPT_ast_dump_filter)));
+static cl::opt<bool> Analyze(
+ "analyze",
+ cl::desc(Options->getOptionHelpText(options::OPT_analyze)));
static cl::opt<bool> Fixit(
"fixit",
@@ -136,6 +140,10 @@ public:
: Extra(Extra), Pos(Pos) {
}
+ InsertAdjuster(const char *Extra, Position Pos)
+ : Extra(1, std::string(Extra)), Pos(Pos) {
+ }
+
virtual CommandLineArguments
Adjust(const CommandLineArguments &Args) LLVM_OVERRIDE {
CommandLineArguments Return(Args);
@@ -182,13 +190,33 @@ int main(int argc, const char **argv) {
ClangTool Tool(OptionsParser.getCompilations(),
OptionsParser.getSourcePathList());
- if (ArgsAfter.size() > 0)
- Tool.appendArgumentsAdjuster(new InsertAdjuster(ArgsAfter, InsertAdjuster::END));
- if (ArgsBefore.size() > 0)
- Tool.appendArgumentsAdjuster(new InsertAdjuster(ArgsBefore, InsertAdjuster::BEGIN));
-
- if (Fixit)
- return Tool.run(newFrontendActionFactory<FixItAction>());
- clang_check::ClangCheckActionFactory Factory;
- return Tool.run(newFrontendActionFactory(&Factory));
+ // Clear adjusters because -fsyntax-only is inserted by the default chain.
+ Tool.clearArgumentsAdjusters();
+ Tool.appendArgumentsAdjuster(new ClangStripOutputAdjuster());
+ if (ArgsAfter.size() > 0) {
+ Tool.appendArgumentsAdjuster(new InsertAdjuster(ArgsAfter,
+ InsertAdjuster::END));
+ }
+ if (ArgsBefore.size() > 0) {
+ Tool.appendArgumentsAdjuster(new InsertAdjuster(ArgsBefore,
+ InsertAdjuster::BEGIN));
+ }
+
+ // Running the analyzer requires --analyze. Other modes can work with the
+ // -fsyntax-only option.
+ Tool.appendArgumentsAdjuster(new InsertAdjuster(
+ Analyze ? "--analyze" : "-fsyntax-only", InsertAdjuster::BEGIN));
+
+ clang_check::ClangCheckActionFactory CheckFactory;
+ FrontendActionFactory *FrontendFactory;
+
+ // Choose the correct factory based on the selected mode.
+ if (Analyze)
+ FrontendFactory = newFrontendActionFactory<clang::ento::AnalysisAction>();
+ else if (Fixit)
+ FrontendFactory = newFrontendActionFactory<FixItAction>();
+ else
+ FrontendFactory = newFrontendActionFactory(&CheckFactory);
+
+ return Tool.run(FrontendFactory);
}
More information about the cfe-commits
mailing list