From 27925c327d9f3164e3ba966ffaed5715681480fd Mon Sep 17 00:00:00 2001 From: Zahira Ammarguellat Date: Thu, 21 Nov 2024 07:03:46 -0800 Subject: [PATCH 1/2] [NFC] Fix uninitialized pointer field. --- clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp index 9161c0e702a28..6d87a2fba27dc 100644 --- a/clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp @@ -23,7 +23,7 @@ AST_MATCHER(StringLiteral, isOrdinary) { return Node.isOrdinary(); } } // namespace UseStdPrintCheck::UseStdPrintCheck(StringRef Name, ClangTidyContext *Context) - : ClangTidyCheck(Name, Context), + : ClangTidyCheck(Name, Context), PP(PP), StrictMode(Options.getLocalOrGlobal("StrictMode", false)), PrintfLikeFunctions(utils::options::parseStringList( Options.get("PrintfLikeFunctions", ""))), From 6683cdef8060a68fe837b7d2a07cfbd146610698 Mon Sep 17 00:00:00 2001 From: Zahira Ammarguellat Date: Thu, 21 Nov 2024 07:43:19 -0800 Subject: [PATCH 2/2] Addressed review comments. --- clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp index 6d87a2fba27dc..4f24098225074 100644 --- a/clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/UseStdPrintCheck.cpp @@ -23,7 +23,7 @@ AST_MATCHER(StringLiteral, isOrdinary) { return Node.isOrdinary(); } } // namespace UseStdPrintCheck::UseStdPrintCheck(StringRef Name, ClangTidyContext *Context) - : ClangTidyCheck(Name, Context), PP(PP), + : ClangTidyCheck(Name, Context), PP(nullptr), StrictMode(Options.getLocalOrGlobal("StrictMode", false)), PrintfLikeFunctions(utils::options::parseStringList( Options.get("PrintfLikeFunctions", ""))), @@ -131,6 +131,7 @@ void UseStdPrintCheck::check(const MatchFinder::MatchResult &Result) { utils::FormatStringConverter::Configuration ConverterConfig; ConverterConfig.StrictMode = StrictMode; ConverterConfig.AllowTrailingNewlineRemoval = true; + assert(PP && "Preprocessor should be set by registerPPCallbacks"); utils::FormatStringConverter Converter( Result.Context, Printf, FormatArgOffset, ConverterConfig, getLangOpts(), *Result.SourceManager, *PP);