Author: Benjamin Kramer Date: 2025-01-08T14:46:15+01:00 New Revision: 35c5e56b6113b468b521c071ac141b4bb94da1d7
URL: https://github.com/llvm/llvm-project/commit/35c5e56b6113b468b521c071ac141b4bb94da1d7 DIFF: https://github.com/llvm/llvm-project/commit/35c5e56b6113b468b521c071ac141b4bb94da1d7.diff LOG: Clean up -Wdangling-assignment-gsl in clang and mlir These are triggering after b037bceef6a40c5c00c1f67cc5a334e2c4e5e041. Added: Modified: clang-tools-extra/include-cleaner/lib/Analysis.cpp clang/tools/driver/driver.cpp mlir/lib/Dialect/Affine/Utils/LoopUtils.cpp mlir/lib/Dialect/SCF/Utils/Utils.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/include-cleaner/lib/Analysis.cpp b/clang-tools-extra/include-cleaner/lib/Analysis.cpp index 16013f53894e8d..e3a4834cb19aeb 100644 --- a/clang-tools-extra/include-cleaner/lib/Analysis.cpp +++ b/clang-tools-extra/include-cleaner/lib/Analysis.cpp @@ -85,8 +85,9 @@ analyze(llvm::ArrayRef<Decl *> ASTRoots, const auto MainFile = *SM.getFileEntryRefForID(SM.getMainFileID()); llvm::DenseSet<const Include *> Used; llvm::StringMap<Header> Missing; + constexpr auto DefaultHeaderFilter = [](llvm::StringRef) { return false; }; if (!HeaderFilter) - HeaderFilter = [](llvm::StringRef) { return false; }; + HeaderFilter = DefaultHeaderFilter; OptionalDirectoryEntryRef ResourceDir = PP.getHeaderSearchInfo().getModuleMap().getBuiltinDir(); walkUsed(ASTRoots, MacroRefs, PI, PP, diff --git a/clang/tools/driver/driver.cpp b/clang/tools/driver/driver.cpp index 12038de476ace1..ffd157e60997cd 100644 --- a/clang/tools/driver/driver.cpp +++ b/clang/tools/driver/driver.cpp @@ -355,10 +355,12 @@ int clang_main(int Argc, char **Argv, const llvm::ToolContext &ToolContext) { if (!SetBackdoorDriverOutputsFromEnvVars(TheDriver)) return 1; + auto ExecuteCC1WithContext = + [&ToolContext](SmallVectorImpl<const char *> &ArgV) { + return ExecuteCC1Tool(ArgV, ToolContext); + }; if (!UseNewCC1Process) { - TheDriver.CC1Main = [ToolContext](SmallVectorImpl<const char *> &ArgV) { - return ExecuteCC1Tool(ArgV, ToolContext); - }; + TheDriver.CC1Main = ExecuteCC1WithContext; // Ensure the CC1Command actually catches cc1 crashes llvm::CrashRecoveryContext::Enable(); } diff --git a/mlir/lib/Dialect/Affine/Utils/LoopUtils.cpp b/mlir/lib/Dialect/Affine/Utils/LoopUtils.cpp index 0f2c889d4f390d..4e02559a089493 100644 --- a/mlir/lib/Dialect/Affine/Utils/LoopUtils.cpp +++ b/mlir/lib/Dialect/Affine/Utils/LoopUtils.cpp @@ -919,8 +919,9 @@ static void generateUnrolledLoop( // 'forOp'. auto builder = OpBuilder::atBlockTerminator(loopBodyBlock); + constexpr auto defaultAnnotateFn = [](unsigned, Operation *, OpBuilder) {}; if (!annotateFn) - annotateFn = [](unsigned, Operation *, OpBuilder) {}; + annotateFn = defaultAnnotateFn; // Keep a pointer to the last non-terminator operation in the original block // so that we know what to clone (since we are doing this in-place). diff --git a/mlir/lib/Dialect/SCF/Utils/Utils.cpp b/mlir/lib/Dialect/SCF/Utils/Utils.cpp index 41410a0a56aa98..6cda7100fe073d 100644 --- a/mlir/lib/Dialect/SCF/Utils/Utils.cpp +++ b/mlir/lib/Dialect/SCF/Utils/Utils.cpp @@ -329,8 +329,9 @@ static void generateUnrolledLoop( // 'forOp'. auto builder = OpBuilder::atBlockTerminator(loopBodyBlock); + constexpr auto defaultAnnotateFn = [](unsigned, Operation *, OpBuilder) {}; if (!annotateFn) - annotateFn = [](unsigned, Operation *, OpBuilder) {}; + annotateFn = defaultAnnotateFn; // Keep a pointer to the last non-terminator operation in the original block // so that we know what to clone (since we are doing this in-place). _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
