From 40271e4fde2ef77e48d9804caa5ffc73a30318f0 Mon Sep 17 00:00:00 2001 From: Kristof Umann Date: Tue, 2 Oct 2018 19:27:34 +0000 Subject: [PATCH] [analyzer][NFC] Refactor functions in PlistDiagnostics to take AnalyzerOptions as parameter I intend to add a new flag macro-expnasions-as-events, and unfortunately I'll only be able to convert the macro piece into an event one once I'm about to emit it, due to the lack of an avaible Preprocessor object in the BugReporter. Differential Revision: https://reviews.llvm.org/D52787 llvm-svn: 343620 --- .../StaticAnalyzer/Core/PlistDiagnostics.cpp | 57 +++++++++++-------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp b/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp index 7cb7c156e2f7..2e5d10602376 100644 --- a/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp +++ b/clang/lib/StaticAnalyzer/Core/PlistDiagnostics.cpp @@ -32,8 +32,8 @@ namespace { class PlistDiagnostics : public PathDiagnosticConsumer { const std::string OutputFile; const Preprocessor &PP; + AnalyzerOptions &AnOpts; const bool SupportsCrossFileDiagnostics; - const bool SerializeStatistics; public: PlistDiagnostics(AnalyzerOptions &AnalyzerOpts, const std::string& prefix, @@ -63,22 +63,23 @@ PlistDiagnostics::PlistDiagnostics(AnalyzerOptions &AnalyzerOpts, const std::string& output, const Preprocessor &PP, bool supportsMultipleFiles) - : OutputFile(output), PP(PP), - SupportsCrossFileDiagnostics(supportsMultipleFiles), - SerializeStatistics(AnalyzerOpts.shouldSerializeStats()) {} + : OutputFile(output), PP(PP), AnOpts(AnalyzerOpts), + SupportsCrossFileDiagnostics(supportsMultipleFiles) {} void ento::createPlistDiagnosticConsumer(AnalyzerOptions &AnalyzerOpts, PathDiagnosticConsumers &C, const std::string& s, const Preprocessor &PP) { - C.push_back(new PlistDiagnostics(AnalyzerOpts, s, PP, false)); + C.push_back(new PlistDiagnostics(AnalyzerOpts, s, PP, + /*supportsMultipleFiles*/ false)); } void ento::createPlistMultiFileDiagnosticConsumer(AnalyzerOptions &AnalyzerOpts, PathDiagnosticConsumers &C, const std::string &s, const Preprocessor &PP) { - C.push_back(new PlistDiagnostics(AnalyzerOpts, s, PP, true)); + C.push_back(new PlistDiagnostics(AnalyzerOpts, s, PP, + /*supportsMultipleFiles*/ true)); } static void EmitRanges(raw_ostream &o, @@ -175,7 +176,8 @@ static void ReportControlFlow(raw_ostream &o, Indent(o, indent) << "\n"; } -static void ReportEvent(raw_ostream &o, const PathDiagnosticEventPiece& P, +static void ReportEvent(raw_ostream &o, + const PathDiagnosticEventPiece& P, const FIDMap& FM, const Preprocessor &PP, unsigned indent, @@ -219,6 +221,7 @@ static void ReportPiece(raw_ostream &o, const PathDiagnosticPiece &P, const FIDMap& FM, const Preprocessor &PP, + AnalyzerOptions &AnOpts, unsigned indent, unsigned depth, bool includeControlFlow, @@ -228,28 +231,29 @@ static void ReportCall(raw_ostream &o, const PathDiagnosticCallPiece &P, const FIDMap& FM, const Preprocessor &PP, + AnalyzerOptions &AnOpts, unsigned indent, unsigned depth) { if (auto callEnter = P.getCallEnterEvent()) - ReportPiece(o, *callEnter, FM, PP, indent, depth, + ReportPiece(o, *callEnter, FM, PP, AnOpts, indent, depth, /*includeControlFlow*/ true, P.isLastInMainSourceFile()); ++depth; if (auto callEnterWithinCaller = P.getCallEnterWithinCallerEvent()) - ReportPiece(o, *callEnterWithinCaller, FM, PP, indent, depth, + ReportPiece(o, *callEnterWithinCaller, FM, PP, AnOpts, indent, depth, /*includeControlFlow*/ true); for (PathPieces::const_iterator I = P.path.begin(), E = P.path.end();I!=E;++I) - ReportPiece(o, **I, FM, PP, indent, depth, + ReportPiece(o, **I, FM, PP, AnOpts, indent, depth, /*includeControlFlow*/ true); --depth; if (auto callExit = P.getCallExitEvent()) - ReportPiece(o, *callExit, FM, PP, indent, depth, + ReportPiece(o, *callExit, FM, PP, AnOpts, indent, depth, /*includeControlFlow*/ true); } @@ -257,20 +261,21 @@ static void ReportMacro(raw_ostream &o, const PathDiagnosticMacroPiece& P, const FIDMap& FM, const Preprocessor &PP, + AnalyzerOptions &AnOpts, unsigned indent, unsigned depth) { for (PathPieces::const_iterator I = P.subPieces.begin(), E=P.subPieces.end(); I!=E; ++I) { - ReportPiece(o, **I, FM, PP, indent, depth, /*includeControlFlow*/ false); + ReportPiece(o, **I, FM, PP, AnOpts, indent, depth, + /*includeControlFlow*/ false); } } static void ReportNote(raw_ostream &o, const PathDiagnosticNotePiece& P, const FIDMap& FM, const Preprocessor &PP, - unsigned indent, - unsigned depth) { + unsigned indent) { const SourceManager &SM = PP.getSourceManager(); @@ -295,9 +300,12 @@ static void ReportNote(raw_ostream &o, const PathDiagnosticNotePiece& P, Indent(o, indent); o << "\n"; } -static void ReportDiag(raw_ostream &o, const PathDiagnosticPiece& P, - const FIDMap& FM, const Preprocessor &PP) { - ReportPiece(o, P, FM, PP, /*indent*/ 4, /*depth*/ 0, +static void ReportDiag(raw_ostream &o, + const PathDiagnosticPiece& P, + const FIDMap& FM, + const Preprocessor &PP, + AnalyzerOptions &AnOpts) { + ReportPiece(o, P, FM, PP, AnOpts, /*indent*/ 4, /*depth*/ 0, /*includeControlFlow*/ true); } @@ -305,6 +313,7 @@ static void ReportPiece(raw_ostream &o, const PathDiagnosticPiece &P, const FIDMap& FM, const Preprocessor &PP, + AnalyzerOptions &AnOpts, unsigned indent, unsigned depth, bool includeControlFlow, @@ -316,17 +325,19 @@ static void ReportPiece(raw_ostream &o, indent); break; case PathDiagnosticPiece::Call: - ReportCall(o, cast(P), FM, PP, indent, depth); + ReportCall(o, cast(P), FM, PP, AnOpts, indent, + depth); break; case PathDiagnosticPiece::Event: ReportEvent(o, cast(P), FM, PP, indent, depth, isKeyEvent); break; case PathDiagnosticPiece::Macro: - ReportMacro(o, cast(P), FM, PP, indent, depth); + ReportMacro(o, cast(P), FM, PP, AnOpts, indent, + depth); break; case PathDiagnosticPiece::Note: - ReportNote(o, cast(P), FM, PP, indent, depth); + ReportNote(o, cast(P), FM, PP, indent); break; } } @@ -458,7 +469,7 @@ void PlistDiagnostics::FlushDiagnosticsImpl( " \n"; for (; I != FirstNonNote; ++I) - ReportDiag(o, **I, FM, PP); + ReportDiag(o, **I, FM, PP, AnOpts); o << " \n"; } @@ -468,7 +479,7 @@ void PlistDiagnostics::FlushDiagnosticsImpl( o << " \n"; for (PathPieces::const_iterator E = Path.end(); I != E; ++I) - ReportDiag(o, **I, FM, PP); + ReportDiag(o, **I, FM, PP, AnOpts); o << " \n"; @@ -594,7 +605,7 @@ void PlistDiagnostics::FlushDiagnosticsImpl( EmitString(o << " ", SM.getFileEntryForID(FID)->getName()) << '\n'; o << " \n"; - if (llvm::AreStatisticsEnabled() && SerializeStatistics) { + if (llvm::AreStatisticsEnabled() && AnOpts.shouldSerializeStats()) { o << " statistics\n"; std::string stats; llvm::raw_string_ostream os(stats);