Skip to content
Open
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
35df1c6
Bugprone-default-lambda-capture
jjmarr-amd Jul 11, 2025
dbb903f
Merge branch 'main' of github.com:llvm/llvm-project into DefaultLambd…
jjmarr-amd Sep 22, 2025
689f95b
Fix headers
jjmarr-amd Sep 22, 2025
9991b9c
remove superfluous comments.
jjmarr-amd Sep 22, 2025
db17a4c
add new matcher
jjmarr-amd Sep 22, 2025
7dcf216
Replace if with assert
jjmarr-amd Sep 22, 2025
176d195
Remove specific warning type
jjmarr-amd Sep 22, 2025
5f23dff
Sync documentation to release notes
jjmarr-amd Sep 22, 2025
4c41332
Update clang-tools-extra/clang-tidy/bugprone/DefaultLambdaCaptureCheck.h
jjmarr-amd Sep 22, 2025
330dbd8
Remove superfluous include
jjmarr-amd Sep 22, 2025
31366e6
Fix doc and release notes
jjmarr-amd Sep 22, 2025
70df9df
Fix const
jjmarr-amd Sep 22, 2025
0418517
Merge branch 'main' into DefaultLambdaCapture
jjmarr-amd Sep 22, 2025
0bcdbc4
Fix header guard
jjmarr-amd Sep 23, 2025
ac709f4
Fix header spelling
jjmarr-amd Sep 23, 2025
5d4c2ca
Rename check to readability-default-lambda-capture
jjmarr-amd Sep 24, 2025
c0b90d1
Update clang-tools-extra/docs/clang-tidy/checks/readability/default-l…
jjmarr-amd Sep 24, 2025
1172f73
update doc
jjmarr-amd Sep 25, 2025
66e6aaa
rename check to readability-avoid-default-lambda-capture
jjmarr-amd Sep 25, 2025
4bf58b6
use C++ style comments
jjmarr-amd Sep 25, 2025
a807dd0
Update clang-tools-extra/docs/clang-tidy/checks/readability/avoid-def…
jjmarr-amd Sep 25, 2025
8fdc097
fix doc again
jjmarr-amd Sep 25, 2025
ab8f4b9
remove reference to coding guideline
jjmarr-amd Sep 25, 2025
a4348de
Merge branch 'main' of github.com:llvm/llvm-project into DefaultLambd…
jjmarr-amd Sep 29, 2025
13b5049
rephrase
jjmarr-amd Sep 29, 2025
043df7c
commit vibe coded work
jjmarr-amd Sep 29, 2025
33af58b
attempt to fix to use something that isn't weird string manipulation
jjmarr-amd Sep 29, 2025
51aa182
more vibe coding with human intervention
jjmarr-amd Sep 29, 2025
dd65b90
go back to the hacky string manipulation
jjmarr-amd Sep 29, 2025
a9509f3
remove AI comments
jjmarr-amd Sep 29, 2025
e9e0f9a
fix namespacing issues
jjmarr-amd Sep 29, 2025
b2c3cc2
remove anonymous namespace
jjmarr-amd Sep 29, 2025
969558e
simplify per code review
jjmarr-amd Oct 1, 2025
359fd6c
Use IIFE so ReplacementText can be const.
jjmarr-amd Oct 1, 2025
4e10e78
simplify code even more
jjmarr-amd Oct 3, 2025
9765c90
Turns out this check doesn't like templated lambdas
jjmarr-amd Oct 3, 2025
33a79a0
ignore VLAs
jjmarr-amd Oct 8, 2025
8f21201
move around doc paragraphs
jjmarr-amd Oct 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//

#include "AvoidDefaultLambdaCaptureCheck.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/Basic/Lambda.h"
#include "clang/Lex/Lexer.h"

using namespace clang::tidy::readability;

static std::string generateCaptureText(const clang::LambdaCapture &Capture) {
if (Capture.capturesThis()) {
return Capture.getCaptureKind() == clang::LCK_StarThis ? "*this" : "this";
}

std::string Result;
if (Capture.getCaptureKind() == clang::LCK_ByRef) {
Result += "&";
}
Result += Capture.getCapturedVar()->getName().str();
return Result;
}

void AvoidDefaultLambdaCaptureCheck::registerMatchers(
clang::ast_matchers::MatchFinder *Finder) {
Finder->addMatcher(
clang::ast_matchers::lambdaExpr(clang::ast_matchers::hasDefaultCapture())
.bind("lambda"),
this);
}

void AvoidDefaultLambdaCaptureCheck::check(
const clang::ast_matchers::MatchFinder::MatchResult &Result) {
const auto *Lambda = Result.Nodes.getNodeAs<clang::LambdaExpr>("lambda");
assert(Lambda);

const clang::SourceLocation DefaultCaptureLoc =
Lambda->getCaptureDefaultLoc();
if (DefaultCaptureLoc.isInvalid())
return;

std::vector<std::string> ImplicitCaptures;
for (const auto &Capture : Lambda->implicit_captures()) {
// It is impossible to explicitly capture a VLA in C++, since VLAs don't
// exist in ISO C++ and so the syntax was never created to capture them.
if (Capture.getCaptureKind() == LCK_VLAType)
return;
ImplicitCaptures.push_back(generateCaptureText(Capture));
}

auto Diag = diag(DefaultCaptureLoc,
"lambda default captures are discouraged; "
"prefer to capture specific variables explicitly");

// For template-dependent lambdas, the list of captures hasn't been created
// yet, so the list of implicit captures is empty.
if (ImplicitCaptures.empty() && Lambda->isGenericLambda())
return;

const auto ReplacementText = [&ImplicitCaptures]() {
return llvm::join(ImplicitCaptures, ", ");
}();

Diag << clang::FixItHint::CreateReplacement(Lambda->getCaptureDefaultLoc(),
ReplacementText);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//

#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_READABILITY_AVOIDDEFAULTLAMBDACAPTURECHECK_H
#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_READABILITY_AVOIDDEFAULTLAMBDACAPTURECHECK_H

#include "../ClangTidyCheck.h"

namespace clang::tidy::readability {

/// Flags lambdas that use default capture modes
///
/// For the user-facing documentation see:
/// https://clang.llvm.org/extra/clang-tidy/checks/readability/avoid-default-lambda-capture.html
class AvoidDefaultLambdaCaptureCheck : public ClangTidyCheck {
public:
AvoidDefaultLambdaCaptureCheck(StringRef Name, ClangTidyContext *Context)
: ClangTidyCheck(Name, Context) {}
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
std::optional<TraversalKind> getCheckTraversalKind() const override {
return TK_IgnoreUnlessSpelledInSource;
}
};

} // namespace clang::tidy::readability

#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_READABILITY_AVOIDDEFAULTLAMBDACAPTURECHECK_H
1 change: 1 addition & 0 deletions clang-tools-extra/clang-tidy/readability/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ set(LLVM_LINK_COMPONENTS
add_clang_library(clangTidyReadabilityModule STATIC
AmbiguousSmartptrResetCallCheck.cpp
AvoidConstParamsInDecls.cpp
AvoidDefaultLambdaCaptureCheck.cpp
AvoidNestedConditionalOperatorCheck.cpp
AvoidReturnWithVoidValueCheck.cpp
AvoidUnconditionalPreprocessorIfCheck.cpp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "../ClangTidyModuleRegistry.h"
#include "AmbiguousSmartptrResetCallCheck.h"
#include "AvoidConstParamsInDecls.h"
#include "AvoidDefaultLambdaCaptureCheck.h"
#include "AvoidNestedConditionalOperatorCheck.h"
#include "AvoidReturnWithVoidValueCheck.h"
#include "AvoidUnconditionalPreprocessorIfCheck.h"
Expand Down Expand Up @@ -93,6 +94,8 @@ class ReadabilityModule : public ClangTidyModule {
"readability-container-size-empty");
CheckFactories.registerCheck<ConvertMemberFunctionsToStatic>(
"readability-convert-member-functions-to-static");
CheckFactories.registerCheck<AvoidDefaultLambdaCaptureCheck>(
"readability-avoid-default-lambda-capture");
CheckFactories.registerCheck<DeleteNullPointerCheck>(
"readability-delete-null-pointer");
CheckFactories.registerCheck<DuplicateIncludeCheck>(
Expand Down
5 changes: 5 additions & 0 deletions clang-tools-extra/docs/ReleaseNotes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,11 @@ New checks
Finds virtual function overrides with different visibility than the function
in the base class.

- New :doc:`readability-avoid-default-lambda-capture
<clang-tidy/checks/readability/avoid-default-lambda-capture>` check.

Warns on default lambda captures (e.g. ``[&](){ ... }``, ``[=](){ ... }``).

- New :doc:`readability-redundant-parentheses
<clang-tidy/checks/readability/redundant-parentheses>` check.

Expand Down
1 change: 1 addition & 0 deletions clang-tools-extra/docs/clang-tidy/checks/list.rst
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ Clang-Tidy Checks
:doc:`readability-container-data-pointer <readability/container-data-pointer>`, "Yes"
:doc:`readability-container-size-empty <readability/container-size-empty>`, "Yes"
:doc:`readability-convert-member-functions-to-static <readability/convert-member-functions-to-static>`, "Yes"
:doc:`readability-avoid-default-lambda-capture <readability/avoid-default-lambda-capture>`,
:doc:`readability-delete-null-pointer <readability/delete-null-pointer>`, "Yes"
:doc:`readability-duplicate-include <readability/duplicate-include>`, "Yes"
:doc:`readability-else-after-return <readability/else-after-return>`, "Yes"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
.. title:: clang-tidy - readability-avoid-default-lambda-capture

readability-avoid-default-lambda-capture
========================================

Warns on default lambda captures (e.g. ``[&](){ ... }``, ``[=](){ ... }``).

Captures can lead to subtle bugs including dangling references and unnecessary
copies. Writing out the name of the variables being captured reminds programmers
and reviewers to know what is being captured. And knowing is half the battle.

Coding guidelines that recommend against defaulted lambda captures include:

* Item 31 of Effective Modern C++ by Scott Meyers

This check does not lint for variable-length array (VLA) captures. VLAs are not
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about moving before list of guidelines?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seemed like a post-script to me, but sure.

ISO C++, and it is impossible to explicitly capture them as the syntax does not
exist.

Example
-------

.. code-block:: c++

#include <iostream>

class Widget {
std::vector<std::function<void(int)>> callbacks;
int widgetId;
void addCallback(int factoryId) {
callbacks.emplace_back(
[&](){
std::cout << "Widget " << widgetId << " made in factory " << factoryId;
}
);
}
}

When ``callbacks`` is executed, ``factoryId`` will dangle. Writing the name of
``factoryId`` in the capture list reminds the reader that it is being captured,
which will hopefully lead to the bug being fixed during code review.

.. code-block:: c++

#include <iostream>

class Widget {
std::vector<std::function<void(int)>> callbacks;
int widgetId;
void addCallback(int factoryId) {
callbacks.emplace_back(
[&factoryId, &widgetId](){ // Why isn't factoryId captured by value??
std::cout << "Widget " << widgetId << " made in factory " << factoryId;
}
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
// RUN: %check_clang_tidy %s readability-avoid-default-lambda-capture %t -- -- -Wno-vla-extension

void test_default_captures() {
int value = 42;
int another = 10;

auto lambda1 = [=](int x) { return value + x; };
// CHECK-MESSAGES: :[[@LINE-1]]:19: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
// CHECK-FIXES: auto lambda1 = [value](int x) { return value + x; };

auto lambda2 = [&](int x) { return value + x; };
// CHECK-MESSAGES: :[[@LINE-1]]:19: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
// CHECK-FIXES: auto lambda2 = [&value](int x) { return value + x; };

auto lambda3 = [=, &another](int x) { return value + another + x; };
// CHECK-MESSAGES: :[[@LINE-1]]:19: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
// CHECK-FIXES: auto lambda3 = [value, &another](int x) { return value + another + x; };

auto lambda4 = [&, value](int x) { return value + another + x; };
// CHECK-MESSAGES: :[[@LINE-1]]:19: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
// CHECK-FIXES: auto lambda4 = [&another, value](int x) { return value + another + x; };
}

void test_acceptable_captures() {
int value = 42;
int another = 10;

auto lambda1 = [value](int x) { return value + x; };
auto lambda2 = [&value](int x) { return value + x; };
auto lambda3 = [value, another](int x) { return value + another + x; };
auto lambda4 = [&value, &another](int x) { return value + another + x; };

auto lambda5 = [](int x, int y) { return x + y; };

struct S {
int member = 5;
void foo() {
auto lambda = [this]() { return member; };
}
};
}

void test_nested_lambdas() {
int outer_var = 1;
int middle_var = 2;
int inner_var = 3;

auto outer = [=]() {
// CHECK-MESSAGES: :[[@LINE-1]]:17: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
// CHECK-FIXES: auto outer = [outer_var, middle_var, inner_var]() {

auto inner = [&](int x) { return outer_var + middle_var + inner_var + x; };
// CHECK-MESSAGES: :[[@LINE-1]]:19: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
// CHECK-FIXES: auto inner = [&outer_var, &middle_var, &inner_var](int x) { return outer_var + middle_var + inner_var + x; };

return inner(10);
};
}

void test_lambda_returns() {
int a = 1, b = 2, c = 3;

auto create_adder = [=](int x) {
// CHECK-MESSAGES: :[[@LINE-1]]:24: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
// CHECK-FIXES: auto create_adder = [](int x) {
return [x](int y) { return x + y; }; // Inner lambda is fine - explicit capture
};

auto func1 = [&]() { return a; };
// CHECK-MESSAGES: :[[@LINE-1]]:17: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
// CHECK-FIXES: auto func1 = [&a]() { return a; };

auto func2 = [=]() { return b; };
// CHECK-MESSAGES: :[[@LINE-1]]:17: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
// CHECK-FIXES: auto func2 = [b]() { return b; };
}

class TestClass {
int member = 42;

public:
void test_member_function_lambdas() {
int local = 10;

auto lambda1 = [=]() { return member + local; };
// CHECK-MESSAGES: :[[@LINE-1]]:21: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
// CHECK-FIXES: auto lambda1 = [this, local]() { return member + local; };

auto lambda2 = [&]() { return member + local; };
// CHECK-MESSAGES: :[[@LINE-1]]:21: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
// CHECK-FIXES: auto lambda2 = [this, &local]() { return member + local; };

auto lambda3 = [this, local]() { return member + local; };
auto lambda4 = [this, &local]() { return member + local; };
}
};

// Lambda captures dependent on a template parameter don't have a fix it
template<typename T>
void test_template_lambdas() {
T value{};

auto lambda = [=](T x) { return value + x; };
// CHECK-MESSAGES: :[[@LINE-1]]:18: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
}

void instantiate_templates() {
test_template_lambdas<int>();
test_template_lambdas<double>();
}

void test_init_captures() {
int x = 3;
int nx = 5;

int y1 = [&, z = x + 5]() -> int {
// CHECK-MESSAGES: :[[@LINE-1]]:13: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
// CHECK-FIXES: int y1 = [&nx, z = x + 5]() -> int {
return z * z + nx;
}();

int y2 = [=, &ref = x]() {
// CHECK-MESSAGES: :[[@LINE-1]]:13: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
// CHECK-FIXES: int y2 = [nx, &ref = x]() {
ref += 1;
return nx - ref;
}();

(void)y1;
(void)y2;
}

void test_vla_no_crash() {
// VLAs create implicit VLA bound captures that cannot be written explicitly.
// No warning should be issued.
int n = 5;
int vla[n];
for (int i = 0; i < n; ++i) {
vla[i] = i * 10;
}

auto lambda = [&]() { return vla[0]; };
}
14 changes: 14 additions & 0 deletions clang/include/clang/ASTMatchers/ASTMatchers.h
Original file line number Diff line number Diff line change
Expand Up @@ -5096,6 +5096,20 @@ AST_MATCHER_P(LambdaCapture, capturesVar, internal::Matcher<ValueDecl>,
/// matches `[this]() { return cc; }`.
AST_MATCHER(LambdaCapture, capturesThis) { return Node.capturesThis(); }

/// Matches lambda expressions that have default capture modes.
///
/// Given
/// \code
/// auto l1 = [=]() {}; // matches
/// auto l2 = [&]() {}; // matches
/// auto l3 = []() {}; // does not match
/// \endcode
/// lambdaExpr(hasDefaultCapture())
/// matches l1 and l2, but not l3.
AST_MATCHER(LambdaExpr, hasDefaultCapture) {
return Node.getCaptureDefault() != LCD_None;
}

/// Matches a constructor call expression which uses list initialization.
AST_MATCHER(CXXConstructExpr, isListInitialization) {
return Node.isListInitialization();
Expand Down
Loading