Author: ibiryukov
Date: Thu Mar 1 04:43:39 2018
New Revision: 326432
URL: http://llvm.org/viewvc/llvm-project?rev=326432&view=rev
Log:
Revert "[analyzer] Support for naive cross translation unit analysis"
Also revert "[analyzer] Fix a compiler warning"
This reverts commits r326323 and r326324.
Reason: the commits introduced a cyclic dependency in the build graph.
This happens to work with cmake, but breaks out internal integrate.
Removed:
cfe/trunk/test/Analysis/Inputs/ctu-chain.cpp
cfe/trunk/test/Analysis/Inputs/ctu-other.cpp
cfe/trunk/test/Analysis/Inputs/externalFnMap.txt
cfe/trunk/test/Analysis/ctu-main.cpp
Modified:
cfe/trunk/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h
cfe/trunk/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp
cfe/trunk/lib/StaticAnalyzer/Core/CMakeLists.txt
cfe/trunk/lib/StaticAnalyzer/Core/CallEvent.cpp
cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp
cfe/trunk/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
cfe/trunk/lib/StaticAnalyzer/Frontend/CMakeLists.txt
cfe/trunk/test/Analysis/analyzer-config.cpp
cfe/trunk/tools/scan-build-py/README.md
cfe/trunk/tools/scan-build-py/libscanbuild/__init__.py
cfe/trunk/tools/scan-build-py/libscanbuild/analyze.py
cfe/trunk/tools/scan-build-py/libscanbuild/arguments.py
cfe/trunk/tools/scan-build-py/libscanbuild/clang.py
cfe/trunk/tools/scan-build-py/libscanbuild/report.py
cfe/trunk/tools/scan-build-py/tests/unit/test_analyze.py
cfe/trunk/tools/scan-build-py/tests/unit/test_clang.py
Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h (original)
+++ cfe/trunk/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h Thu Mar 1
04:43:39 2018
@@ -308,16 +308,6 @@ private:
/// \sa shouldDisplayNotesAsEvents
Optional<bool> DisplayNotesAsEvents;
- /// \sa getCTUDir
- Optional<StringRef> CTUDir;
-
- /// \sa getCTUIndexName
- Optional<StringRef> CTUIndexName;
-
- /// \sa naiveCTUEnabled
- Optional<bool> NaiveCTU;
-
-
/// A helper function that retrieves option for a given full-qualified
/// checker name.
/// Options for checkers can be specified via 'analyzer-config' command-line
@@ -647,17 +637,6 @@ public:
/// to false when unset.
bool shouldDisplayNotesAsEvents();
- /// Returns the directory containing the CTU related files.
- StringRef getCTUDir();
-
- /// Returns the name of the file containing the CTU index of functions.
- StringRef getCTUIndexName();
-
- /// Returns true when naive cross translation unit analysis is enabled.
- /// This is an experimental feature to inline functions from another
- /// translation units.
- bool naiveCTUEnabled();
-
public:
AnalyzerOptions() :
AnalysisStoreOpt(RegionStoreModel),
Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
(original)
+++ cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h Thu
Mar 1 04:43:39 2018
@@ -38,10 +38,6 @@ class CXXThisExpr;
class MaterializeTemporaryExpr;
class ObjCAtSynchronizedStmt;
class ObjCForCollectionStmt;
-
-namespace cross_tu {
-class CrossTranslationUnitContext;
-}
namespace ento {
@@ -78,8 +74,6 @@ public:
};
private:
- cross_tu::CrossTranslationUnitContext &CTU;
-
AnalysisManager &AMgr;
AnalysisDeclContextManager &AnalysisDeclContexts;
@@ -121,9 +115,10 @@ private:
InliningModes HowToInline;
public:
- ExprEngine(cross_tu::CrossTranslationUnitContext &CTU, AnalysisManager &mgr,
- bool gcEnabled, SetOfConstDecls *VisitedCalleesIn,
- FunctionSummariesTy *FS, InliningModes HowToInlineIn);
+ ExprEngine(AnalysisManager &mgr, bool gcEnabled,
+ SetOfConstDecls *VisitedCalleesIn,
+ FunctionSummariesTy *FS,
+ InliningModes HowToInlineIn);
~ExprEngine() override;
@@ -155,11 +150,6 @@ public:
BugReporter& getBugReporter() { return BR; }
- cross_tu::CrossTranslationUnitContext *
- getCrossTranslationUnitContext() override {
- return &CTU;
- }
-
const NodeBuilderContext &getBuilderContext() {
assert(currBldrCtx);
return *currBldrCtx;
Modified: cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h
(original)
+++ cfe/trunk/include/clang/StaticAnalyzer/Core/PathSensitive/SubEngine.h Thu
Mar 1 04:43:39 2018
@@ -24,10 +24,6 @@ class CFGElement;
class LocationContext;
class Stmt;
-namespace cross_tu {
-class CrossTranslationUnitContext;
-}
-
namespace ento {
struct NodeBuilderContext;
@@ -53,9 +49,6 @@ public:
virtual AnalysisManager &getAnalysisManager() = 0;
- virtual cross_tu::CrossTranslationUnitContext *
- getCrossTranslationUnitContext() = 0;
-
virtual ProgramStateManager &getStateManager() = 0;
/// Called by CoreEngine. Used to generate new successor
Modified: cfe/trunk/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp Thu Mar 1 04:43:39
2018
@@ -433,26 +433,3 @@ bool AnalyzerOptions::shouldDisplayNotes
getBooleanOption("notes-as-events", /*Default=*/false);
return DisplayNotesAsEvents.getValue();
}
-
-StringRef AnalyzerOptions::getCTUDir() {
- if (!CTUDir.hasValue()) {
- CTUDir = getOptionAsString("ctu-dir", "");
- if (!llvm::sys::fs::is_directory(*CTUDir))
- CTUDir = "";
- }
- return CTUDir.getValue();
-}
-
-bool AnalyzerOptions::naiveCTUEnabled() {
- if (!NaiveCTU.hasValue()) {
- NaiveCTU = getBooleanOption("experimental-enable-naive-ctu-analysis",
- /*Default=*/false);
- }
- return NaiveCTU.getValue();
-}
-
-StringRef AnalyzerOptions::getCTUIndexName() {
- if (!CTUIndexName.hasValue())
- CTUIndexName = getOptionAsString("ctu-index-name", "externalFnMap.txt");
- return CTUIndexName.getValue();
-}
Modified: cfe/trunk/lib/StaticAnalyzer/Core/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/CMakeLists.txt?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/CMakeLists.txt (original)
+++ cfe/trunk/lib/StaticAnalyzer/Core/CMakeLists.txt Thu Mar 1 04:43:39 2018
@@ -58,7 +58,6 @@ add_clang_library(clangStaticAnalyzerCor
clangASTMatchers
clangAnalysis
clangBasic
- clangCrossTU
clangLex
clangRewrite
${Z3_LINK_FILES}
Modified: cfe/trunk/lib/StaticAnalyzer/Core/CallEvent.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/CallEvent.cpp?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/CallEvent.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Core/CallEvent.cpp Thu Mar 1 04:43:39 2018
@@ -28,7 +28,6 @@
#include "clang/Analysis/AnalysisDeclContext.h"
#include "clang/Analysis/CFG.h"
#include "clang/Analysis/ProgramPoint.h"
-#include "clang/CrossTU/CrossTranslationUnit.h"
#include "clang/Basic/IdentifierTable.h"
#include "clang/Basic/LLVM.h"
#include "clang/Basic/SourceLocation.h"
@@ -406,27 +405,7 @@ RuntimeDefinition AnyFunctionCall::getRu
}
}
- SubEngine *Engine = getState()->getStateManager().getOwningEngine();
- AnalyzerOptions &Opts = Engine->getAnalysisManager().options;
-
- // Try to get CTU definition only if CTUDir is provided.
- if (!Opts.naiveCTUEnabled())
- return RuntimeDefinition();
-
- cross_tu::CrossTranslationUnitContext &CTUCtx =
- *Engine->getCrossTranslationUnitContext();
- llvm::Expected<const FunctionDecl *> CTUDeclOrError =
- CTUCtx.getCrossTUDefinition(FD, Opts.getCTUDir(),
Opts.getCTUIndexName());
-
- if (!CTUDeclOrError) {
- handleAllErrors(CTUDeclOrError.takeError(),
- [&](const cross_tu::IndexError &IE) {
- CTUCtx.emitCrossTUDiagnostics(IE);
- });
- return {};
- }
-
- return RuntimeDefinition(*CTUDeclOrError);
+ return {};
}
void AnyFunctionCall::getInitialStackFrameContents(
Modified: cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Core/ExprEngine.cpp Thu Mar 1 04:43:39 2018
@@ -23,7 +23,6 @@
#include "clang/Basic/Builtins.h"
#include "clang/Basic/PrettyStackTrace.h"
#include "clang/Basic/SourceManager.h"
-#include "clang/CrossTU/CrossTranslationUnit.h"
#include "clang/StaticAnalyzer/Core/BugReporter/BugType.h"
#include "clang/StaticAnalyzer/Core/CheckerManager.h"
#include "clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h"
@@ -99,11 +98,11 @@ REGISTER_TRAIT_WITH_PROGRAMSTATE(CXXNewA
static const char* TagProviderName = "ExprEngine";
-ExprEngine::ExprEngine(cross_tu::CrossTranslationUnitContext &CTU,
AnalysisManager &mgr,
- bool gcEnabled, SetOfConstDecls *VisitedCalleesIn,
+ExprEngine::ExprEngine(AnalysisManager &mgr, bool gcEnabled,
+ SetOfConstDecls *VisitedCalleesIn,
FunctionSummariesTy *FS,
InliningModes HowToInlineIn)
- : CTU(CTU), AMgr(mgr),
+ : AMgr(mgr),
AnalysisDeclContexts(mgr.getAnalysisDeclContextManager()),
Engine(*this, FS, mgr.getAnalyzerOptions()),
G(Engine.getGraph()),
Modified: cfe/trunk/lib/StaticAnalyzer/Core/PathDiagnostic.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/PathDiagnostic.cpp?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/PathDiagnostic.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Core/PathDiagnostic.cpp Thu Mar 1 04:43:39
2018
@@ -379,25 +379,11 @@ static Optional<bool> comparePath(const
return None;
}
-static bool compareCrossTUSourceLocs(FullSourceLoc XL, FullSourceLoc YL) {
- std::pair<FileID, unsigned> XOffs = XL.getDecomposedLoc();
- std::pair<FileID, unsigned> YOffs = YL.getDecomposedLoc();
- const SourceManager &SM = XL.getManager();
- std::pair<bool, bool> InSameTU = SM.isInTheSameTranslationUnit(XOffs, YOffs);
- if (InSameTU.first)
- return XL.isBeforeInTranslationUnitThan(YL);
- const FileEntry *XFE = SM.getFileEntryForID(XL.getFileID());
- const FileEntry *YFE = SM.getFileEntryForID(YL.getFileID());
- if (!XFE || !YFE)
- return XFE && !YFE;
- return XFE->getName() < YFE->getName();
-}
-
static bool compare(const PathDiagnostic &X, const PathDiagnostic &Y) {
FullSourceLoc XL = X.getLocation().asLocation();
FullSourceLoc YL = Y.getLocation().asLocation();
if (XL != YL)
- return compareCrossTUSourceLocs(XL, YL);
+ return XL.isBeforeInTranslationUnitThan(YL);
if (X.getBugType() != Y.getBugType())
return X.getBugType() < Y.getBugType();
if (X.getCategory() != Y.getCategory())
@@ -417,8 +403,7 @@ static bool compare(const PathDiagnostic
SourceLocation YDL = YD->getLocation();
if (XDL != YDL) {
const SourceManager &SM = XL.getManager();
- return compareCrossTUSourceLocs(FullSourceLoc(XDL, SM),
- FullSourceLoc(YDL, SM));
+ return SM.isBeforeInTranslationUnit(XDL, YDL);
}
}
PathDiagnostic::meta_iterator XI = X.meta_begin(), XE = X.meta_end();
Modified: cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Frontend/AnalysisConsumer.cpp Thu Mar 1
04:43:39 2018
@@ -22,7 +22,6 @@
#include "clang/Analysis/CallGraph.h"
#include "clang/Analysis/CodeInjector.h"
#include "clang/Basic/SourceManager.h"
-#include "clang/CrossTU/CrossTranslationUnit.h"
#include "clang/Frontend/CompilerInstance.h"
#include "clang/Lex/Preprocessor.h"
#include "clang/StaticAnalyzer/Checkers/LocalCheckers.h"
@@ -171,7 +170,6 @@ public:
AnalyzerOptionsRef Opts;
ArrayRef<std::string> Plugins;
CodeInjector *Injector;
- cross_tu::CrossTranslationUnitContext CTU;
/// \brief Stores the declarations from the local translation unit.
/// Note, we pre-compute the local declarations at parse time as an
@@ -197,12 +195,12 @@ public:
/// translation unit.
FunctionSummariesTy FunctionSummaries;
- AnalysisConsumer(CompilerInstance &CI, const std::string &outdir,
+ AnalysisConsumer(const Preprocessor &pp, const std::string &outdir,
AnalyzerOptionsRef opts, ArrayRef<std::string> plugins,
CodeInjector *injector)
- : RecVisitorMode(0), RecVisitorBR(nullptr), Ctx(nullptr),
- PP(CI.getPreprocessor()), OutDir(outdir), Opts(std::move(opts)),
- Plugins(plugins), Injector(injector), CTU(CI) {
+ : RecVisitorMode(0), RecVisitorBR(nullptr), Ctx(nullptr), PP(pp),
+ OutDir(outdir), Opts(std::move(opts)), Plugins(plugins),
+ Injector(injector) {
DigestAnalyzerOptions();
if (Opts->PrintStats || Opts->shouldSerializeStats()) {
AnalyzerTimers = llvm::make_unique<llvm::TimerGroup>(
@@ -734,8 +732,7 @@ void AnalysisConsumer::ActionExprEngine(
if (!Mgr->getAnalysisDeclContext(D)->getAnalysis<RelaxedLiveVariables>())
return;
- ExprEngine Eng(CTU, *Mgr, ObjCGCEnabled, VisitedCallees, &FunctionSummaries,
- IMode);
+ ExprEngine Eng(*Mgr, ObjCGCEnabled, VisitedCallees,
&FunctionSummaries,IMode);
// Set the graph auditor.
std::unique_ptr<ExplodedNode::Auditor> Auditor;
@@ -793,7 +790,7 @@ ento::CreateAnalysisConsumer(CompilerIns
bool hasModelPath = analyzerOpts->Config.count("model-path") > 0;
return llvm::make_unique<AnalysisConsumer>(
- CI, CI.getFrontendOpts().OutputFile, analyzerOpts,
+ CI.getPreprocessor(), CI.getFrontendOpts().OutputFile, analyzerOpts,
CI.getFrontendOpts().Plugins,
hasModelPath ? new ModelInjector(CI) : nullptr);
}
Modified: cfe/trunk/lib/StaticAnalyzer/Frontend/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Frontend/CMakeLists.txt?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Frontend/CMakeLists.txt (original)
+++ cfe/trunk/lib/StaticAnalyzer/Frontend/CMakeLists.txt Thu Mar 1 04:43:39
2018
@@ -15,7 +15,6 @@ add_clang_library(clangStaticAnalyzerFro
clangAST
clangAnalysis
clangBasic
- clangCrossTU
clangFrontend
clangLex
clangStaticAnalyzerCheckers
Removed: cfe/trunk/test/Analysis/Inputs/ctu-chain.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/Inputs/ctu-chain.cpp?rev=326431&view=auto
==============================================================================
--- cfe/trunk/test/Analysis/Inputs/ctu-chain.cpp (original)
+++ cfe/trunk/test/Analysis/Inputs/ctu-chain.cpp (removed)
@@ -1,20 +0,0 @@
-int h_chain(int x) {
- return x * 2;
-}
-
-namespace chns {
-int chf3(int x);
-
-int chf2(int x) {
- return chf3(x);
-}
-
-class chcls {
-public:
- int chf4(int x);
-};
-
-int chcls::chf4(int x) {
- return x * 3;
-}
-}
Removed: cfe/trunk/test/Analysis/Inputs/ctu-other.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/Inputs/ctu-other.cpp?rev=326431&view=auto
==============================================================================
--- cfe/trunk/test/Analysis/Inputs/ctu-other.cpp (original)
+++ cfe/trunk/test/Analysis/Inputs/ctu-other.cpp (removed)
@@ -1,67 +0,0 @@
-int callback_to_main(int x);
-int f(int x) {
- return x - 1;
-}
-
-int g(int x) {
- return callback_to_main(x) + 1;
-}
-
-int h_chain(int);
-
-int h(int x) {
- return 2 * h_chain(x);
-}
-
-namespace myns {
-int fns(int x) {
- return x + 7;
-}
-
-namespace embed_ns {
-int fens(int x) {
- return x - 3;
-}
-}
-
-class embed_cls {
-public:
- int fecl(int x) {
- return x - 7;
- }
-};
-}
-
-class mycls {
-public:
- int fcl(int x) {
- return x + 5;
- }
- static int fscl(int x) {
- return x + 6;
- }
-
- class embed_cls2 {
- public:
- int fecl2(int x) {
- return x - 11;
- }
- };
-};
-
-namespace chns {
-int chf2(int x);
-
-class chcls {
-public:
- int chf4(int x);
-};
-
-int chf3(int x) {
- return chcls().chf4(x);
-}
-
-int chf1(int x) {
- return chf2(x);
-}
-}
Removed: cfe/trunk/test/Analysis/Inputs/externalFnMap.txt
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/Inputs/externalFnMap.txt?rev=326431&view=auto
==============================================================================
--- cfe/trunk/test/Analysis/Inputs/externalFnMap.txt (original)
+++ cfe/trunk/test/Analysis/Inputs/externalFnMap.txt (removed)
@@ -1,13 +0,0 @@
-c:@N@chns@F@chf1#I# ctu-other.cpp.ast
-c:@N@myns@N@embed_ns@F@fens#I# ctu-other.cpp.ast
-c:@F@g#I# ctu-other.cpp.ast
-c:@S@mycls@F@fscl#I#S ctu-other.cpp.ast
-c:@S@mycls@F@fcl#I# ctu-other.cpp.ast
-c:@N@myns@S@embed_cls@F@fecl#I# ctu-other.cpp.ast
-c:@S@mycls@S@embed_cls2@F@fecl2#I# ctu-other.cpp.ast
-c:@F@f#I# ctu-other.cpp.ast
-c:@N@myns@F@fns#I# ctu-other.cpp.ast
-c:@F@h#I# ctu-other.cpp.ast
-c:@F@h_chain#I# ctu-chain.cpp.ast
-c:@N@chns@S@chcls@F@chf4#I# ctu-chain.cpp.ast
-c:@N@chns@F@chf2#I# ctu-chain.cpp.ast
Modified: cfe/trunk/test/Analysis/analyzer-config.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/analyzer-config.cpp?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/test/Analysis/analyzer-config.cpp (original)
+++ cfe/trunk/test/Analysis/analyzer-config.cpp Thu Mar 1 04:43:39 2018
@@ -30,7 +30,6 @@ public:
// CHECK-NEXT: cfg-loopexit = false
// CHECK-NEXT: cfg-rich-constructors = true
// CHECK-NEXT: cfg-temporary-dtors = false
-// CHECK-NEXT: experimental-enable-naive-ctu-analysis = false
// CHECK-NEXT: exploration_strategy = unexplored_first_queue
// CHECK-NEXT: faux-bodies = true
// CHECK-NEXT: graph-trim-interval = 1000
@@ -48,4 +47,4 @@ public:
// CHECK-NEXT: unroll-loops = false
// CHECK-NEXT: widen-loops = false
// CHECK-NEXT: [stats]
-// CHECK-NEXT: num-entries = 28
+// CHECK-NEXT: num-entries = 27
Removed: cfe/trunk/test/Analysis/ctu-main.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/ctu-main.cpp?rev=326431&view=auto
==============================================================================
--- cfe/trunk/test/Analysis/ctu-main.cpp (original)
+++ cfe/trunk/test/Analysis/ctu-main.cpp (removed)
@@ -1,58 +0,0 @@
-// RUN: mkdir -p %T/ctudir
-// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -emit-pch -o
%T/ctudir/ctu-other.cpp.ast %S/Inputs/ctu-other.cpp
-// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -emit-pch -o
%T/ctudir/ctu-chain.cpp.ast %S/Inputs/ctu-chain.cpp
-// RUN: cp %S/Inputs/externalFnMap.txt %T/ctudir/
-// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -fsyntax-only -analyze
-analyzer-checker=core,debug.ExprInspection -analyzer-config
experimental-enable-naive-ctu-analysis=true -analyzer-config ctu-dir=%T/ctudir
-verify %s
-
-void clang_analyzer_eval(int);
-
-int f(int);
-int g(int);
-int h(int);
-
-int callback_to_main(int x) { return x + 1; }
-
-namespace myns {
-int fns(int x);
-
-namespace embed_ns {
-int fens(int x);
-}
-
-class embed_cls {
-public:
- int fecl(int x);
-};
-}
-
-class mycls {
-public:
- int fcl(int x);
- static int fscl(int x);
-
- class embed_cls2 {
- public:
- int fecl2(int x);
- };
-};
-
-namespace chns {
-int chf1(int x);
-}
-
-int main() {
- clang_analyzer_eval(f(3) == 2); // expected-warning{{TRUE}}
- clang_analyzer_eval(f(4) == 3); // expected-warning{{TRUE}}
- clang_analyzer_eval(f(5) == 3); // expected-warning{{FALSE}}
- clang_analyzer_eval(g(4) == 6); // expected-warning{{TRUE}}
- clang_analyzer_eval(h(2) == 8); // expected-warning{{TRUE}}
-
- clang_analyzer_eval(myns::fns(2) == 9); //
expected-warning{{TRUE}}
- clang_analyzer_eval(myns::embed_ns::fens(2) == -1); //
expected-warning{{TRUE}}
- clang_analyzer_eval(mycls().fcl(1) == 6); //
expected-warning{{TRUE}}
- clang_analyzer_eval(mycls::fscl(1) == 7); //
expected-warning{{TRUE}}
- clang_analyzer_eval(myns::embed_cls().fecl(1) == -6); //
expected-warning{{TRUE}}
- clang_analyzer_eval(mycls::embed_cls2().fecl2(0) == -11); //
expected-warning{{TRUE}}
-
- clang_analyzer_eval(chns::chf1(4) == 12); // expected-warning{{TRUE}}
-}
Modified: cfe/trunk/tools/scan-build-py/README.md
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-build-py/README.md?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/tools/scan-build-py/README.md (original)
+++ cfe/trunk/tools/scan-build-py/README.md Thu Mar 1 04:43:39 2018
@@ -41,32 +41,6 @@ goes like this:
Use `--help` to know more about the commands.
-How to use the experimental Cross Translation Unit analysis
------------------------------------------------------------
-
-To run the CTU analysis, a compilation database file has to be created:
-
- $ intercept-build <your build command>
-
-To run the Clang Static Analyzer against a compilation database
-with CTU analysis enabled, execute:
-
- $ analyze-build --ctu
-
-For CTU analysis an additional (function-definition) collection-phase is
required.
-For debugging purposes, it is possible to separately execute the collection
-and the analysis phase. By doing this, the intermediate files used for
-the analysis are kept on the disk in `./ctu-dir`.
-
- # Collect and store the data required by the CTU analysis
- $ analyze-build --ctu-collect-only
-
- # Analyze using the previously collected data
- $ analyze-build --ctu-analyze-only
-
-Use `--help` to get more information about the commands.
-
-
Limitations
-----------
Modified: cfe/trunk/tools/scan-build-py/libscanbuild/__init__.py
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-build-py/libscanbuild/__init__.py?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/tools/scan-build-py/libscanbuild/__init__.py (original)
+++ cfe/trunk/tools/scan-build-py/libscanbuild/__init__.py Thu Mar 1 04:43:39
2018
@@ -19,9 +19,6 @@ ENVIRONMENT_KEY = 'INTERCEPT_BUILD'
Execution = collections.namedtuple('Execution', ['pid', 'cwd', 'cmd'])
-CtuConfig = collections.namedtuple('CtuConfig', ['collect', 'analyze', 'dir',
- 'func_map_cmd'])
-
def duplicate_check(method):
""" Predicate to detect duplicated entries.
Modified: cfe/trunk/tools/scan-build-py/libscanbuild/analyze.py
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-build-py/libscanbuild/analyze.py?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/tools/scan-build-py/libscanbuild/analyze.py (original)
+++ cfe/trunk/tools/scan-build-py/libscanbuild/analyze.py Thu Mar 1 04:43:39
2018
@@ -22,19 +22,16 @@ import functools
import subprocess
import contextlib
import datetime
-import shutil
-import glob
-from collections import defaultdict
from libscanbuild import command_entry_point, compiler_wrapper, \
- wrapper_environment, run_build, run_command, CtuConfig
+ wrapper_environment, run_build, run_command
from libscanbuild.arguments import parse_args_for_scan_build, \
parse_args_for_analyze_build
from libscanbuild.intercept import capture
from libscanbuild.report import document
from libscanbuild.compilation import split_command, classify_source, \
compiler_language
-from libscanbuild.clang import get_version, get_arguments, get_triple_arch
+from libscanbuild.clang import get_version, get_arguments
from libscanbuild.shell import decode
__all__ = ['scan_build', 'analyze_build', 'analyze_compiler_wrapper']
@@ -42,9 +39,6 @@ __all__ = ['scan_build', 'analyze_build'
COMPILER_WRAPPER_CC = 'analyze-cc'
COMPILER_WRAPPER_CXX = 'analyze-c++'
-CTU_FUNCTION_MAP_FILENAME = 'externalFnMap.txt'
-CTU_TEMP_FNMAP_FOLDER = 'tmpExternalFnMaps'
-
@command_entry_point
def scan_build():
@@ -62,7 +56,7 @@ def scan_build():
exit_code = capture(args)
# Run the analyzer against the captured commands.
if need_analyzer(args.build):
- govern_analyzer_runs(args)
+ run_analyzer_parallel(args)
else:
# Run build command and analyzer with compiler wrappers.
environment = setup_environment(args)
@@ -81,7 +75,7 @@ def analyze_build():
# will re-assign the report directory as new output
with report_directory(args.output, args.keep_empty) as args.output:
# Run the analyzer against a compilation db.
- govern_analyzer_runs(args)
+ run_analyzer_parallel(args)
# Cover report generation and bug counting.
number_of_bugs = document(args)
# Set exit status as it was requested.
@@ -101,108 +95,6 @@ def need_analyzer(args):
return len(args) and not re.search('configure|autogen', args[0])
-def prefix_with(constant, pieces):
- """ From a sequence create another sequence where every second element
- is from the original sequence and the odd elements are the prefix.
-
- eg.: prefix_with(0, [1,2,3]) creates [0, 1, 0, 2, 0, 3] """
-
- return [elem for piece in pieces for elem in [constant, piece]]
-
-
-def get_ctu_config_from_args(args):
- """ CTU configuration is created from the chosen phases and dir. """
-
- return (
- CtuConfig(collect=args.ctu_phases.collect,
- analyze=args.ctu_phases.analyze,
- dir=args.ctu_dir,
- func_map_cmd=args.func_map_cmd)
- if hasattr(args, 'ctu_phases') and hasattr(args.ctu_phases, 'dir')
- else CtuConfig(collect=False, analyze=False, dir='', func_map_cmd=''))
-
-
-def get_ctu_config_from_json(ctu_conf_json):
- """ CTU configuration is created from the chosen phases and dir. """
-
- ctu_config = json.loads(ctu_conf_json)
- # Recover namedtuple from json when coming from analyze-cc or analyze-c++
- return CtuConfig(collect=ctu_config[0],
- analyze=ctu_config[1],
- dir=ctu_config[2],
- func_map_cmd=ctu_config[3])
-
-
-def create_global_ctu_function_map(func_map_lines):
- """ Takes iterator of individual function maps and creates a global map
- keeping only unique names. We leave conflicting names out of CTU.
-
- :param func_map_lines: Contains the id of a function (mangled name) and
- the originating source (the corresponding AST file) name.
- :type func_map_lines: Iterator of str.
- :returns: Mangled name - AST file pairs.
- :rtype: List of (str, str) tuples.
- """
-
- mangled_to_asts = defaultdict(set)
-
- for line in func_map_lines:
- mangled_name, ast_file = line.strip().split(' ', 1)
- mangled_to_asts[mangled_name].add(ast_file)
-
- mangled_ast_pairs = []
-
- for mangled_name, ast_files in mangled_to_asts.items():
- if len(ast_files) == 1:
- mangled_ast_pairs.append((mangled_name, next(iter(ast_files))))
-
- return mangled_ast_pairs
-
-
-def merge_ctu_func_maps(ctudir):
- """ Merge individual function maps into a global one.
-
- As the collect phase runs parallel on multiple threads, all compilation
- units are separately mapped into a temporary file in CTU_TEMP_FNMAP_FOLDER.
- These function maps contain the mangled names of functions and the source
- (AST generated from the source) which had them.
- These files should be merged at the end into a global map file:
- CTU_FUNCTION_MAP_FILENAME."""
-
- def generate_func_map_lines(fnmap_dir):
- """ Iterate over all lines of input files in a determined order. """
-
- files = glob.glob(os.path.join(fnmap_dir, '*'))
- files.sort()
- for filename in files:
- with open(filename, 'r') as in_file:
- for line in in_file:
- yield line
-
- def write_global_map(arch, mangled_ast_pairs):
- """ Write (mangled function name, ast file) pairs into final file. """
-
- extern_fns_map_file = os.path.join(ctudir, arch,
- CTU_FUNCTION_MAP_FILENAME)
- with open(extern_fns_map_file, 'w') as out_file:
- for mangled_name, ast_file in mangled_ast_pairs:
- out_file.write('%s %s\n' % (mangled_name, ast_file))
-
- triple_arches = glob.glob(os.path.join(ctudir, '*'))
- for triple_path in triple_arches:
- if os.path.isdir(triple_path):
- triple_arch = os.path.basename(triple_path)
- fnmap_dir = os.path.join(ctudir, triple_arch,
- CTU_TEMP_FNMAP_FOLDER)
-
- func_map_lines = generate_func_map_lines(fnmap_dir)
- mangled_ast_pairs = create_global_ctu_function_map(func_map_lines)
- write_global_map(triple_arch, mangled_ast_pairs)
-
- # Remove all temporary files
- shutil.rmtree(fnmap_dir, ignore_errors=True)
-
-
def run_analyzer_parallel(args):
""" Runs the analyzer against the given compilation database. """
@@ -217,8 +109,7 @@ def run_analyzer_parallel(args):
'output_format': args.output_format,
'output_failures': args.output_failures,
'direct_args': analyzer_params(args),
- 'force_debug': args.force_debug,
- 'ctu': get_ctu_config_from_args(args)
+ 'force_debug': args.force_debug
}
logging.debug('run analyzer against compilation database')
@@ -236,38 +127,6 @@ def run_analyzer_parallel(args):
pool.join()
-def govern_analyzer_runs(args):
- """ Governs multiple runs in CTU mode or runs once in normal mode. """
-
- ctu_config = get_ctu_config_from_args(args)
- # If we do a CTU collect (1st phase) we remove all previous collection
- # data first.
- if ctu_config.collect:
- shutil.rmtree(ctu_config.dir, ignore_errors=True)
-
- # If the user asked for a collect (1st) and analyze (2nd) phase, we do an
- # all-in-one run where we deliberately remove collection data before and
- # also after the run. If the user asks only for a single phase data is
- # left so multiple analyze runs can use the same data gathered by a single
- # collection run.
- if ctu_config.collect and ctu_config.analyze:
- # CTU strings are coming from args.ctu_dir and func_map_cmd,
- # so we can leave it empty
- args.ctu_phases = CtuConfig(collect=True, analyze=False,
- dir='', func_map_cmd='')
- run_analyzer_parallel(args)
- merge_ctu_func_maps(ctu_config.dir)
- args.ctu_phases = CtuConfig(collect=False, analyze=True,
- dir='', func_map_cmd='')
- run_analyzer_parallel(args)
- shutil.rmtree(ctu_config.dir, ignore_errors=True)
- else:
- # Single runs (collect or analyze) are launched from here.
- run_analyzer_parallel(args)
- if ctu_config.collect:
- merge_ctu_func_maps(ctu_config.dir)
-
-
def setup_environment(args):
""" Set up environment for build command to interpose compiler wrapper. """
@@ -281,8 +140,7 @@ def setup_environment(args):
'ANALYZE_BUILD_REPORT_FORMAT': args.output_format,
'ANALYZE_BUILD_REPORT_FAILURES': 'yes' if args.output_failures else '',
'ANALYZE_BUILD_PARAMETERS': ' '.join(analyzer_params(args)),
- 'ANALYZE_BUILD_FORCE_DEBUG': 'yes' if args.force_debug else '',
- 'ANALYZE_BUILD_CTU': json.dumps(get_ctu_config_from_args(args))
+ 'ANALYZE_BUILD_FORCE_DEBUG': 'yes' if args.force_debug else ''
})
return environment
@@ -315,8 +173,7 @@ def analyze_compiler_wrapper_impl(result
'').split(' '),
'force_debug': os.getenv('ANALYZE_BUILD_FORCE_DEBUG'),
'directory': execution.cwd,
- 'command': [execution.cmd[0], '-c'] + compilation.flags,
- 'ctu': get_ctu_config_from_json(os.getenv('ANALYZE_BUILD_CTU'))
+ 'command': [execution.cmd[0], '-c'] + compilation.flags
}
# call static analyzer against the compilation
for source in compilation.files:
@@ -366,6 +223,14 @@ def analyzer_params(args):
""" A group of command line arguments can mapped to command
line arguments of the analyzer. This method generates those. """
+ def prefix_with(constant, pieces):
+ """ From a sequence create another sequence where every second element
+ is from the original sequence and the odd elements are the prefix.
+
+ eg.: prefix_with(0, [1,2,3]) creates [0, 1, 0, 2, 0, 3] """
+
+ return [elem for piece in pieces for elem in [constant, piece]]
+
result = []
if args.store_model:
@@ -429,9 +294,8 @@ def require(required):
'direct_args', # arguments from command line
'force_debug', # kill non debug macros
'output_dir', # where generated report files shall go
- 'output_format', # it's 'plist', 'html', both or plist-multi-file
- 'output_failures', # generate crash reports or not
- 'ctu']) # ctu control options
+ 'output_format', # it's 'plist' or 'html' or both
+ 'output_failures']) # generate crash reports or not
def run(opts):
""" Entry point to run (or not) static analyzer against a single entry
of the compilation database.
@@ -519,10 +383,7 @@ def run_analyzer(opts, continuation=repo
def target():
""" Creates output file name for reports. """
- if opts['output_format'] in {
- 'plist',
- 'plist-html',
- 'plist-multi-file'}:
+ if opts['output_format'] in {'plist', 'plist-html'}:
(handle, name) = tempfile.mkstemp(prefix='report-',
suffix='.plist',
dir=opts['output_dir'])
@@ -546,109 +407,8 @@ def run_analyzer(opts, continuation=repo
return result
-def func_map_list_src_to_ast(func_src_list):
- """ Turns textual function map list with source files into a
- function map list with ast files. """
-
- func_ast_list = []
- for fn_src_txt in func_src_list:
- mangled_name, path = fn_src_txt.split(" ", 1)
- # Normalize path on windows as well
- path = os.path.splitdrive(path)[1]
- # Make relative path out of absolute
- path = path[1:] if path[0] == os.sep else path
- ast_path = os.path.join("ast", path + ".ast")
- func_ast_list.append(mangled_name + " " + ast_path)
- return func_ast_list
-
-
-@require(['clang', 'directory', 'flags', 'direct_args', 'file', 'ctu'])
-def ctu_collect_phase(opts):
- """ Preprocess source by generating all data needed by CTU analysis. """
-
- def generate_ast(triple_arch):
- """ Generates ASTs for the current compilation command. """
-
- args = opts['direct_args'] + opts['flags']
- ast_joined_path = os.path.join(opts['ctu'].dir, triple_arch, 'ast',
- os.path.realpath(opts['file'])[1:] +
- '.ast')
- ast_path = os.path.abspath(ast_joined_path)
- ast_dir = os.path.dirname(ast_path)
- if not os.path.isdir(ast_dir):
- try:
- os.makedirs(ast_dir)
- except OSError:
- # In case an other process already created it.
- pass
- ast_command = [opts['clang'], '-emit-ast']
- ast_command.extend(args)
- ast_command.append('-w')
- ast_command.append(opts['file'])
- ast_command.append('-o')
- ast_command.append(ast_path)
- logging.debug("Generating AST using '%s'", ast_command)
- run_command(ast_command, cwd=opts['directory'])
-
- def map_functions(triple_arch):
- """ Generate function map file for the current source. """
-
- args = opts['direct_args'] + opts['flags']
- funcmap_command = [opts['ctu'].func_map_cmd]
- funcmap_command.append(opts['file'])
- funcmap_command.append('--')
- funcmap_command.extend(args)
- logging.debug("Generating function map using '%s'", funcmap_command)
- func_src_list = run_command(funcmap_command, cwd=opts['directory'])
- func_ast_list = func_map_list_src_to_ast(func_src_list)
- extern_fns_map_folder = os.path.join(opts['ctu'].dir, triple_arch,
- CTU_TEMP_FNMAP_FOLDER)
- if not os.path.isdir(extern_fns_map_folder):
- try:
- os.makedirs(extern_fns_map_folder)
- except OSError:
- # In case an other process already created it.
- pass
- if func_ast_list:
- with tempfile.NamedTemporaryFile(mode='w',
- dir=extern_fns_map_folder,
- delete=False) as out_file:
- out_file.write("\n".join(func_ast_list) + "\n")
-
- cwd = opts['directory']
- cmd = [opts['clang'], '--analyze'] + opts['direct_args'] + opts['flags'] \
- + [opts['file']]
- triple_arch = get_triple_arch(cmd, cwd)
- generate_ast(triple_arch)
- map_functions(triple_arch)
-
-
-@require(['ctu'])
-def dispatch_ctu(opts, continuation=run_analyzer):
- """ Execute only one phase of 2 phases of CTU if needed. """
-
- ctu_config = opts['ctu']
-
- if ctu_config.collect or ctu_config.analyze:
- assert ctu_config.collect != ctu_config.analyze
- if ctu_config.collect:
- return ctu_collect_phase(opts)
- if ctu_config.analyze:
- cwd = opts['directory']
- cmd = [opts['clang'], '--analyze'] + opts['direct_args'] \
- + opts['flags'] + [opts['file']]
- triarch = get_triple_arch(cmd, cwd)
- ctu_options = ['ctu-dir=' + os.path.join(ctu_config.dir, triarch),
- 'experimental-enable-naive-ctu-analysis=true']
- analyzer_options = prefix_with('-analyzer-config', ctu_options)
- direct_options = prefix_with('-Xanalyzer', analyzer_options)
- opts['direct_args'].extend(direct_options)
-
- return continuation(opts)
-
-
@require(['flags', 'force_debug'])
-def filter_debug_flags(opts, continuation=dispatch_ctu):
+def filter_debug_flags(opts, continuation=run_analyzer):
""" Filter out nondebug macros when requested. """
if opts.pop('force_debug'):
@@ -715,7 +475,6 @@ def arch_check(opts, continuation=langua
logging.debug('analysis, on default arch')
return continuation(opts)
-
# To have good results from static analyzer certain compiler options shall be
# omitted. The compiler flag filtering only affects the static analyzer run.
#
Modified: cfe/trunk/tools/scan-build-py/libscanbuild/arguments.py
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-build-py/libscanbuild/arguments.py?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/tools/scan-build-py/libscanbuild/arguments.py (original)
+++ cfe/trunk/tools/scan-build-py/libscanbuild/arguments.py Thu Mar 1 04:43:39
2018
@@ -18,8 +18,8 @@ import sys
import argparse
import logging
import tempfile
-from libscanbuild import reconfigure_logging, CtuConfig
-from libscanbuild.clang import get_checkers, is_ctu_capable
+from libscanbuild import reconfigure_logging
+from libscanbuild.clang import get_checkers
__all__ = ['parse_args_for_intercept_build', 'parse_args_for_analyze_build',
'parse_args_for_scan_build']
@@ -98,11 +98,6 @@ def normalize_args_for_analyze(args, fro
# add cdb parameter invisibly to make report module working.
args.cdb = 'compile_commands.json'
- # Make ctu_dir an abspath as it is needed inside clang
- if not from_build_command and hasattr(args, 'ctu_phases') \
- and hasattr(args.ctu_phases, 'dir'):
- args.ctu_dir = os.path.abspath(args.ctu_dir)
-
def validate_args_for_analyze(parser, args, from_build_command):
""" Command line parsing is done by the argparse module, but semantic
@@ -127,18 +122,6 @@ def validate_args_for_analyze(parser, ar
elif not from_build_command and not os.path.exists(args.cdb):
parser.error(message='compilation database is missing')
- # If the user wants CTU mode
- if not from_build_command and hasattr(args, 'ctu_phases') \
- and hasattr(args.ctu_phases, 'dir'):
- # If CTU analyze_only, the input directory should exist
- if args.ctu_phases.analyze and not args.ctu_phases.collect \
- and not os.path.exists(args.ctu_dir):
- parser.error(message='missing CTU directory')
- # Check CTU capability via checking clang-func-mapping
- if not is_ctu_capable(args.func_map_cmd):
- parser.error(message="""This version of clang does not support CTU
- functionality or clang-func-mapping command not found.""")
-
def create_intercept_parser():
""" Creates a parser for command-line arguments to 'intercept'. """
@@ -235,15 +218,7 @@ def create_analyze_parser(from_build_com
default='html',
action='store_const',
help="""Cause the results as a set of .html and .plist files.""")
- format_group.add_argument(
- '--plist-multi-file',
- '-plist-multi-file',
- dest='output_format',
- const='plist-multi-file',
- default='html',
- action='store_const',
- help="""Cause the results as a set of .plist files with extra
- information on related files.""")
+ # TODO: implement '-view '
advanced = parser.add_argument_group('advanced options')
advanced.add_argument(
@@ -358,51 +333,6 @@ def create_analyze_parser(from_build_com
if from_build_command:
parser.add_argument(
dest='build', nargs=argparse.REMAINDER, help="""Command to run.""")
- else:
- ctu = parser.add_argument_group('cross translation unit analysis')
- ctu_mutex_group = ctu.add_mutually_exclusive_group()
- ctu_mutex_group.add_argument(
- '--ctu',
- action='store_const',
- const=CtuConfig(collect=True, analyze=True,
- dir='', func_map_cmd=''),
- dest='ctu_phases',
- help="""Perform cross translation unit (ctu) analysis (both collect
- and analyze phases) using default <ctu-dir> for temporary output.
- At the end of the analysis, the temporary directory is removed.""")
- ctu.add_argument(
- '--ctu-dir',
- metavar='<ctu-dir>',
- dest='ctu_dir',
- default='ctu-dir',
- help="""Defines the temporary directory used between ctu
- phases.""")
- ctu_mutex_group.add_argument(
- '--ctu-collect-only',
- action='store_const',
- const=CtuConfig(collect=True, analyze=False,
- dir='', func_map_cmd=''),
- dest='ctu_phases',
- help="""Perform only the collect phase of ctu.
- Keep <ctu-dir> for further use.""")
- ctu_mutex_group.add_argument(
- '--ctu-analyze-only',
- action='store_const',
- const=CtuConfig(collect=False, analyze=True,
- dir='', func_map_cmd=''),
- dest='ctu_phases',
- help="""Perform only the analyze phase of ctu. <ctu-dir> should be
- present and will not be removed after analysis.""")
- ctu.add_argument(
- '--use-func-map-cmd',
- metavar='<path>',
- dest='func_map_cmd',
- default='clang-func-mapping',
- help="""'%(prog)s' uses the 'clang-func-mapping' executable
- relative to itself for generating function maps for static
- analysis. One can override this behavior with this option by using
- the 'clang-func-mapping' packaged with Xcode (on OS X) or from the
- PATH.""")
return parser
Modified: cfe/trunk/tools/scan-build-py/libscanbuild/clang.py
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-build-py/libscanbuild/clang.py?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/tools/scan-build-py/libscanbuild/clang.py (original)
+++ cfe/trunk/tools/scan-build-py/libscanbuild/clang.py Thu Mar 1 04:43:39 2018
@@ -8,13 +8,11 @@
Since Clang command line interface is so rich, but this project is using only
a subset of that, it makes sense to create a function specific wrapper. """
-import subprocess
import re
from libscanbuild import run_command
from libscanbuild.shell import decode
-__all__ = ['get_version', 'get_arguments', 'get_checkers', 'is_ctu_capable',
- 'get_triple_arch']
+__all__ = ['get_version', 'get_arguments', 'get_checkers']
# regex for activated checker
ACTIVE_CHECKER_PATTERN = re.compile(r'^-analyzer-checker=(.*)$')
@@ -154,26 +152,3 @@ def get_checkers(clang, plugins):
raise Exception('Could not query Clang for available checkers.')
return checkers
-
-
-def is_ctu_capable(func_map_cmd):
- """ Detects if the current (or given) clang and function mapping
- executables are CTU compatible. """
-
- try:
- run_command([func_map_cmd, '-version'])
- except (OSError, subprocess.CalledProcessError):
- return False
- return True
-
-
-def get_triple_arch(command, cwd):
- """Returns the architecture part of the target triple for the given
- compilation command. """
-
- cmd = get_arguments(command, cwd)
- try:
- separator = cmd.index("-triple")
- return cmd[separator + 1]
- except (IndexError, ValueError):
- return ""
Modified: cfe/trunk/tools/scan-build-py/libscanbuild/report.py
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-build-py/libscanbuild/report.py?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/tools/scan-build-py/libscanbuild/report.py (original)
+++ cfe/trunk/tools/scan-build-py/libscanbuild/report.py Thu Mar 1 04:43:39
2018
@@ -13,6 +13,7 @@ import os
import os.path
import sys
import shutil
+import itertools
import plistlib
import glob
import json
@@ -254,29 +255,24 @@ def read_crashes(output_dir):
def read_bugs(output_dir, html):
- # type: (str, bool) -> Generator[Dict[str, Any], None, None]
""" Generate a unique sequence of bugs from given output directory.
Duplicates can be in a project if the same module was compiled multiple
times with different compiler options. These would be better to show in
the final report (cover) only once. """
- def empty(file_name):
- return os.stat(file_name).st_size == 0
+ parser = parse_bug_html if html else parse_bug_plist
+ pattern = '*.html' if html else '*.plist'
duplicate = duplicate_check(
lambda bug: '{bug_line}.{bug_path_length}:{bug_file}'.format(**bug))
- # get the right parser for the job.
- parser = parse_bug_html if html else parse_bug_plist
- # get the input files, which are not empty.
- pattern = os.path.join(output_dir, '*.html' if html else '*.plist')
- bug_files = (file for file in glob.iglob(pattern) if not empty(file))
-
- for bug_file in bug_files:
- for bug in parser(bug_file):
- if not duplicate(bug):
- yield bug
+ bugs = itertools.chain.from_iterable(
+ # parser creates a bug generator not the bug itself
+ parser(filename)
+ for filename in glob.iglob(os.path.join(output_dir, pattern)))
+
+ return (bug for bug in bugs if not duplicate(bug))
def parse_bug_plist(filename):
Modified: cfe/trunk/tools/scan-build-py/tests/unit/test_analyze.py
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-build-py/tests/unit/test_analyze.py?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/tools/scan-build-py/tests/unit/test_analyze.py (original)
+++ cfe/trunk/tools/scan-build-py/tests/unit/test_analyze.py Thu Mar 1
04:43:39 2018
@@ -4,12 +4,12 @@
# This file is distributed under the University of Illinois Open Source
# License. See LICENSE.TXT for details.
+import libear
+import libscanbuild.analyze as sut
import unittest
import re
import os
import os.path
-import libear
-import libscanbuild.analyze as sut
class ReportDirectoryTest(unittest.TestCase):
@@ -333,83 +333,3 @@ class RequireDecoratorTest(unittest.Test
def test_method_exception_not_caught(self):
self.assertRaises(Exception, method_exception_from_inside, dict())
-
-
-class PrefixWithTest(unittest.TestCase):
-
- def test_gives_empty_on_empty(self):
- res = sut.prefix_with(0, [])
- self.assertFalse(res)
-
- def test_interleaves_prefix(self):
- res = sut.prefix_with(0, [1, 2, 3])
- self.assertListEqual([0, 1, 0, 2, 0, 3], res)
-
-
-class MergeCtuMapTest(unittest.TestCase):
-
- def test_no_map_gives_empty(self):
- pairs = sut.create_global_ctu_function_map([])
- self.assertFalse(pairs)
-
- def test_multiple_maps_merged(self):
- concat_map = ['c:@F@fun1#I# ast/fun1.c.ast',
- 'c:@F@fun2#I# ast/fun2.c.ast',
- 'c:@F@fun3#I# ast/fun3.c.ast']
- pairs = sut.create_global_ctu_function_map(concat_map)
- self.assertTrue(('c:@F@fun1#I#', 'ast/fun1.c.ast') in pairs)
- self.assertTrue(('c:@F@fun2#I#', 'ast/fun2.c.ast') in pairs)
- self.assertTrue(('c:@F@fun3#I#', 'ast/fun3.c.ast') in pairs)
- self.assertEqual(3, len(pairs))
-
- def test_not_unique_func_left_out(self):
- concat_map = ['c:@F@fun1#I# ast/fun1.c.ast',
- 'c:@F@fun2#I# ast/fun2.c.ast',
- 'c:@F@fun1#I# ast/fun7.c.ast']
- pairs = sut.create_global_ctu_function_map(concat_map)
- self.assertFalse(('c:@F@fun1#I#', 'ast/fun1.c.ast') in pairs)
- self.assertFalse(('c:@F@fun1#I#', 'ast/fun7.c.ast') in pairs)
- self.assertTrue(('c:@F@fun2#I#', 'ast/fun2.c.ast') in pairs)
- self.assertEqual(1, len(pairs))
-
- def test_duplicates_are_kept(self):
- concat_map = ['c:@F@fun1#I# ast/fun1.c.ast',
- 'c:@F@fun2#I# ast/fun2.c.ast',
- 'c:@F@fun1#I# ast/fun1.c.ast']
- pairs = sut.create_global_ctu_function_map(concat_map)
- self.assertTrue(('c:@F@fun1#I#', 'ast/fun1.c.ast') in pairs)
- self.assertTrue(('c:@F@fun2#I#', 'ast/fun2.c.ast') in pairs)
- self.assertEqual(2, len(pairs))
-
- def test_space_handled_in_source(self):
- concat_map = ['c:@F@fun1#I# ast/f un.c.ast']
- pairs = sut.create_global_ctu_function_map(concat_map)
- self.assertTrue(('c:@F@fun1#I#', 'ast/f un.c.ast') in pairs)
- self.assertEqual(1, len(pairs))
-
-
-class FuncMapSrcToAstTest(unittest.TestCase):
-
- def test_empty_gives_empty(self):
- fun_ast_lst = sut.func_map_list_src_to_ast([])
- self.assertFalse(fun_ast_lst)
-
- def test_sources_to_asts(self):
- fun_src_lst = ['c:@F@f1#I# ' + os.path.join(os.sep + 'path', 'f1.c'),
- 'c:@F@f2#I# ' + os.path.join(os.sep + 'path', 'f2.c')]
- fun_ast_lst = sut.func_map_list_src_to_ast(fun_src_lst)
- self.assertTrue('c:@F@f1#I# ' +
- os.path.join('ast', 'path', 'f1.c.ast')
- in fun_ast_lst)
- self.assertTrue('c:@F@f2#I# ' +
- os.path.join('ast', 'path', 'f2.c.ast')
- in fun_ast_lst)
- self.assertEqual(2, len(fun_ast_lst))
-
- def test_spaces_handled(self):
- fun_src_lst = ['c:@F@f1#I# ' + os.path.join(os.sep + 'path', 'f 1.c')]
- fun_ast_lst = sut.func_map_list_src_to_ast(fun_src_lst)
- self.assertTrue('c:@F@f1#I# ' +
- os.path.join('ast', 'path', 'f 1.c.ast')
- in fun_ast_lst)
- self.assertEqual(1, len(fun_ast_lst))
Modified: cfe/trunk/tools/scan-build-py/tests/unit/test_clang.py
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-build-py/tests/unit/test_clang.py?rev=326432&r1=326431&r2=326432&view=diff
==============================================================================
--- cfe/trunk/tools/scan-build-py/tests/unit/test_clang.py (original)
+++ cfe/trunk/tools/scan-build-py/tests/unit/test_clang.py Thu Mar 1 04:43:39
2018
@@ -92,15 +92,3 @@ class ClangGetCheckersTest(unittest.Test
self.assertEqual('Checker One description', result.get('checker.one'))
self.assertTrue('checker.two' in result)
self.assertEqual('Checker Two description', result.get('checker.two'))
-
-
-class ClangIsCtuCapableTest(unittest.TestCase):
- def test_ctu_not_found(self):
- is_ctu = sut.is_ctu_capable('not-found-clang-func-mapping')
- self.assertFalse(is_ctu)
-
-
-class ClangGetTripleArchTest(unittest.TestCase):
- def test_arch_is_not_empty(self):
- arch = sut.get_triple_arch(['clang', '-E', '-'], '.')
- self.assertTrue(len(arch) > 0)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
