https://github.com/vbvictor updated
https://github.com/llvm/llvm-project/pull/135383
>From 4a7cdb4a9f4de5503eba1488306e238b7334912a Mon Sep 17 00:00:00 2001
From: Victor Baranov <bar.victor.2...@gmail.com>
Date: Fri, 11 Apr 2025 20:26:49 +0300
Subject: [PATCH 1/4] [clang-tidy] add support for lambdas in
use-trailing-return-type
---
.../modernize/UseTrailingReturnTypeCheck.cpp | 179 ++++++++++++++++--
.../modernize/UseTrailingReturnTypeCheck.h | 15 +-
clang-tools-extra/docs/ReleaseNotes.rst | 7 +
.../modernize/use-trailing-return-type.rst | 26 ++-
.../use-trailing-return-type-cxx20.cpp | 2 +-
...ng-return-type-transform-lambdas-cxx14.cpp | 24 +++
...ng-return-type-transform-lambdas-cxx20.cpp | 35 ++++
...trailing-return-type-transform-lambdas.cpp | 89 +++++++++
.../use-trailing-return-type-wrong-config.cpp | 5 +
.../modernize/use-trailing-return-type.cpp | 2 -
10 files changed, 362 insertions(+), 22 deletions(-)
create mode 100644
clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-transform-lambdas-cxx14.cpp
create mode 100644
clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-transform-lambdas-cxx20.cpp
create mode 100644
clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-transform-lambdas.cpp
create mode 100644
clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-wrong-config.cpp
diff --git
a/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
index 9774e988d71e2..4191c94f54a47 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
@@ -17,6 +17,30 @@
#include <cctype>
#include <optional>
+namespace clang::tidy {
+
+template <>
+struct OptionEnumMapping<
+ modernize::UseTrailingReturnTypeCheck::TransformLambda> {
+ static llvm::ArrayRef<std::pair<
+ modernize::UseTrailingReturnTypeCheck::TransformLambda, StringRef>>
+ getEnumMapping() {
+ static constexpr std::pair<
+ modernize::UseTrailingReturnTypeCheck::TransformLambda, StringRef>
+ Mapping[] = {
+ {modernize::UseTrailingReturnTypeCheck::TransformLambda::All,
+ "All"},
+ {modernize::UseTrailingReturnTypeCheck::TransformLambda::
+ AllExceptAuto,
+ "AllExceptAuto"},
+ {modernize::UseTrailingReturnTypeCheck::TransformLambda::None,
+ "None"}};
+ return Mapping;
+ }
+};
+
+} // namespace clang::tidy
+
using namespace clang::ast_matchers;
namespace clang::tidy::modernize {
@@ -111,10 +135,17 @@ struct UnqualNameVisitor : public
RecursiveASTVisitor<UnqualNameVisitor> {
private:
const FunctionDecl &F;
};
+
+AST_MATCHER(LambdaExpr, hasExplicitResultType) {
+ return Node.hasExplicitResultType();
+}
+
} // namespace
-constexpr llvm::StringLiteral Message =
+constexpr llvm::StringLiteral MessageFunction =
"use a trailing return type for this function";
+constexpr llvm::StringLiteral MessageLambda =
+ "use a trailing return type for this lambda";
static SourceLocation expandIfMacroId(SourceLocation Loc,
const SourceManager &SM) {
@@ -242,7 +273,7 @@
UseTrailingReturnTypeCheck::classifyTokensBeforeFunctionName(
const MacroInfo *MI = PP->getMacroInfo(&Info);
if (!MI || MI->isFunctionLike()) {
// Cannot handle function style macros.
- diag(F.getLocation(), Message);
+ diag(F.getLocation(), MessageFunction);
return std::nullopt;
}
}
@@ -254,7 +285,7 @@
UseTrailingReturnTypeCheck::classifyTokensBeforeFunctionName(
if (std::optional<ClassifiedToken> CT = classifyToken(F, *PP, T))
ClassifiedTokens.push_back(*CT);
else {
- diag(F.getLocation(), Message);
+ diag(F.getLocation(), MessageFunction);
return std::nullopt;
}
}
@@ -283,7 +314,7 @@ SourceRange
UseTrailingReturnTypeCheck::findReturnTypeAndCVSourceRange(
if (ReturnTypeRange.isInvalid()) {
// Happens if e.g. clang cannot resolve all includes and the return type is
// unknown.
- diag(F.getLocation(), Message);
+ diag(F.getLocation(), MessageFunction);
return {};
}
@@ -383,14 +414,44 @@ void UseTrailingReturnTypeCheck::keepSpecifiers(
}
}
+UseTrailingReturnTypeCheck::UseTrailingReturnTypeCheck(
+ StringRef Name, ClangTidyContext *Context)
+ : ClangTidyCheck(Name, Context),
+ TransformFunctions(Options.get("TransformFunctions", true)),
+ TransformLambdas(Options.get("TransformLambdas", TransformLambda::All)) {
+
+ if (TransformFunctions == false && TransformLambdas == TransformLambda::None)
+ this->configurationDiag(
+ "The check 'modernize-use-trailing-return-type' will not perform any "
+ "analysis because 'TransformFunctions' and 'TransformLambdas' are "
+ "disabled.");
+}
+
+void UseTrailingReturnTypeCheck::storeOptions(
+ ClangTidyOptions::OptionMap &Opts) {
+ Options.store(Opts, "TransformFunctions", TransformFunctions);
+ Options.store(Opts, "TransformLambdas", TransformLambdas);
+}
+
void UseTrailingReturnTypeCheck::registerMatchers(MatchFinder *Finder) {
- auto F = functionDecl(
- unless(anyOf(hasTrailingReturn(), returns(voidType()),
- cxxConversionDecl(), cxxMethodDecl(isImplicit()))))
- .bind("Func");
+ auto F =
+ functionDecl(
+ unless(anyOf(
+ hasTrailingReturn(), returns(voidType()), cxxConversionDecl(),
+ cxxMethodDecl(
+ anyOf(isImplicit(),
+ hasParent(cxxRecordDecl(hasParent(lambdaExpr()))))))))
+ .bind("Func");
+
+ if (TransformFunctions) {
+ Finder->addMatcher(F, this);
+ Finder->addMatcher(friendDecl(hasDescendant(F)).bind("Friend"), this);
+ }
- Finder->addMatcher(F, this);
- Finder->addMatcher(friendDecl(hasDescendant(F)).bind("Friend"), this);
+ if (TransformLambdas != TransformLambda::None) {
+ Finder->addMatcher(
+ lambdaExpr(unless(hasExplicitResultType())).bind("Lambda"), this);
+ }
}
void UseTrailingReturnTypeCheck::registerPPCallbacks(
@@ -402,8 +463,13 @@ void UseTrailingReturnTypeCheck::check(const
MatchFinder::MatchResult &Result) {
assert(PP && "Expected registerPPCallbacks() to have been called before so "
"preprocessor is available");
- const auto *F = Result.Nodes.getNodeAs<FunctionDecl>("Func");
+ if (const auto *Lambda = Result.Nodes.getNodeAs<LambdaExpr>("Lambda")) {
+ diagOnLambda(Lambda, Result);
+ return;
+ }
+
const auto *Fr = Result.Nodes.getNodeAs<FriendDecl>("Friend");
+ const auto *F = Result.Nodes.getNodeAs<FunctionDecl>("Func");
assert(F && "Matcher is expected to find only FunctionDecls");
// Three-way comparison operator<=> is syntactic sugar and generates implicit
@@ -423,7 +489,7 @@ void UseTrailingReturnTypeCheck::check(const
MatchFinder::MatchResult &Result) {
if (F->getDeclaredReturnType()->isFunctionPointerType() ||
F->getDeclaredReturnType()->isMemberFunctionPointerType() ||
F->getDeclaredReturnType()->isMemberPointerType()) {
- diag(F->getLocation(), Message);
+ diag(F->getLocation(), MessageFunction);
return;
}
@@ -440,14 +506,14 @@ void UseTrailingReturnTypeCheck::check(const
MatchFinder::MatchResult &Result) {
// FIXME: This may happen if we have __attribute__((...)) on the function.
// We abort for now. Remove this when the function type location gets
// available in clang.
- diag(F->getLocation(), Message);
+ diag(F->getLocation(), MessageFunction);
return;
}
SourceLocation InsertionLoc =
findTrailingReturnTypeSourceLocation(*F, FTL, Ctx, SM, LangOpts);
if (InsertionLoc.isInvalid()) {
- diag(F->getLocation(), Message);
+ diag(F->getLocation(), MessageFunction);
return;
}
@@ -470,7 +536,7 @@ void UseTrailingReturnTypeCheck::check(const
MatchFinder::MatchResult &Result) {
UnqualNameVisitor UNV{*F};
UNV.TraverseTypeLoc(FTL.getReturnLoc());
if (UNV.Collision) {
- diag(F->getLocation(), Message);
+ diag(F->getLocation(), MessageFunction);
return;
}
@@ -489,9 +555,90 @@ void UseTrailingReturnTypeCheck::check(const
MatchFinder::MatchResult &Result) {
keepSpecifiers(ReturnType, Auto, ReturnTypeCVRange, *F, Fr, Ctx, SM,
LangOpts);
- diag(F->getLocation(), Message)
+ diag(F->getLocation(), MessageFunction)
<< FixItHint::CreateReplacement(ReturnTypeCVRange, Auto)
<< FixItHint::CreateInsertion(InsertionLoc, " -> " + ReturnType);
}
+void UseTrailingReturnTypeCheck::diagOnLambda(
+ const LambdaExpr *Lambda,
+ const ast_matchers::MatchFinder::MatchResult &Result) {
+
+ const CXXMethodDecl *Method = Lambda->getCallOperator();
+ if (!Method || Lambda->hasExplicitResultType())
+ return;
+
+ const ASTContext *Ctx = Result.Context;
+ const QualType ReturnType = Method->getReturnType();
+
+ // We can't write 'auto' in C++11 mode, try to write generic msg and bail
out.
+ if (ReturnType->isDependentType() &&
+ Ctx->getLangOpts().LangStd == LangStandard::lang_cxx11) {
+ if (TransformLambdas == TransformLambda::All)
+ diag(Lambda->getBeginLoc(), MessageLambda);
+ return;
+ }
+
+ if (ReturnType->isUndeducedAutoType() &&
+ TransformLambdas == TransformLambda::AllExceptAuto)
+ return;
+
+ const SourceLocation TrailingReturnInsertLoc =
+ findLambdaTrailingReturnInsertLoc(Method, *Result.SourceManager,
+ getLangOpts(), *Result.Context);
+
+ if (TrailingReturnInsertLoc.isValid())
+ diag(Lambda->getBeginLoc(), "use a trailing return type for this lambda")
+ << FixItHint::CreateInsertion(
+ TrailingReturnInsertLoc,
+ " -> " +
+
ReturnType.getAsString(Result.Context->getPrintingPolicy()));
+ else
+ diag(Lambda->getBeginLoc(), MessageLambda);
+}
+
+SourceLocation UseTrailingReturnTypeCheck::findLambdaTrailingReturnInsertLoc(
+ const CXXMethodDecl *Method, const SourceManager &SM,
+ const LangOptions &LangOpts, const ASTContext &Ctx) {
+ // 'requires' keyword is present in lambda declaration
+ if (Method->getTrailingRequiresClause()) {
+ SourceLocation ParamEndLoc;
+ if (Method->param_empty()) {
+ ParamEndLoc = Method->getBeginLoc();
+ } else {
+ ParamEndLoc = Method->getParametersSourceRange().getEnd();
+ }
+
+ std::pair<FileID, unsigned> ParamEndLocInfo =
+ SM.getDecomposedLoc(ParamEndLoc);
+ StringRef Buffer = SM.getBufferData(ParamEndLocInfo.first);
+
+ Lexer Lexer(SM.getLocForStartOfFile(ParamEndLocInfo.first), LangOpts,
+ Buffer.begin(), Buffer.data() + ParamEndLocInfo.second,
+ Buffer.end());
+
+ Token Token;
+ while (!Lexer.LexFromRawLexer(Token)) {
+ if (Token.is(tok::raw_identifier)) {
+ IdentifierInfo &Info = Ctx.Idents.get(StringRef(
+ SM.getCharacterData(Token.getLocation()), Token.getLength()));
+ Token.setIdentifierInfo(&Info);
+ Token.setKind(Info.getTokenID());
+ }
+
+ if (Token.is(tok::kw_requires)) {
+ return Token.getLocation().getLocWithOffset(-1);
+ }
+ }
+
+ return {};
+ }
+
+ // If no requires clause, insert before the body
+ if (const Stmt *Body = Method->getBody())
+ return Body->getBeginLoc().getLocWithOffset(-1);
+
+ return {};
+}
+
} // namespace clang::tidy::modernize
diff --git
a/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.h
b/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.h
index 5fb6ae945f466..5a340707e8558 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.h
+++ b/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.h
@@ -27,18 +27,22 @@ struct ClassifiedToken {
///
http://clang.llvm.org/extra/clang-tidy/checks/modernize/use-trailing-return-type.html
class UseTrailingReturnTypeCheck : public ClangTidyCheck {
public:
- UseTrailingReturnTypeCheck(StringRef Name, ClangTidyContext *Context)
- : ClangTidyCheck(Name, Context) {}
+ UseTrailingReturnTypeCheck(StringRef Name, ClangTidyContext *Context);
bool isLanguageVersionSupported(const LangOptions &LangOpts) const override {
return LangOpts.CPlusPlus11;
}
+ void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void registerPPCallbacks(const SourceManager &SM, Preprocessor *PP,
Preprocessor *ModuleExpanderPP) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
+ enum TransformLambda { All, AllExceptAuto, None };
+
private:
Preprocessor *PP = nullptr;
+ const bool TransformFunctions;
+ const TransformLambda TransformLambdas;
SourceLocation findTrailingReturnTypeSourceLocation(
const FunctionDecl &F, const FunctionTypeLoc &FTL, const ASTContext &Ctx,
@@ -56,6 +60,13 @@ class UseTrailingReturnTypeCheck : public ClangTidyCheck {
SourceRange ReturnTypeCVRange, const FunctionDecl &F,
const FriendDecl *Fr, const ASTContext &Ctx,
const SourceManager &SM, const LangOptions &LangOpts);
+
+ void diagOnLambda(const LambdaExpr *Lambda,
+ const ast_matchers::MatchFinder::MatchResult &Result);
+ SourceLocation findLambdaTrailingReturnInsertLoc(const CXXMethodDecl *Method,
+ const SourceManager &SM,
+ const LangOptions &LangOpts,
+ const ASTContext &Ctx);
};
} // namespace clang::tidy::modernize
diff --git a/clang-tools-extra/docs/ReleaseNotes.rst
b/clang-tools-extra/docs/ReleaseNotes.rst
index fefb085409b44..f980630950f04 100644
--- a/clang-tools-extra/docs/ReleaseNotes.rst
+++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -185,6 +185,13 @@ Changes in existing checks
<clang-tidy/checks/modernize/use-std-numbers>` check to support math
functions of different precisions.
+- Improved :doc:`modernize-use-trailing-return-type
+ <clang-tidy/checks/modernize/use-trailing-return-type>` check by adding
+ support to modernize lambda signatures to use trailing return type and adding
+ two new options: `TransformFunctions` and `TransformLambdas` to control
+ whether function declarations and lambdas should be transformed by the check.
+ Fixed false positives when lambda was matched as a function in C++11 mode.
+
- Improved :doc:`performance-move-const-arg
<clang-tidy/checks/performance/move-const-arg>` check by fixing false
negatives on ternary operators calling ``std::move``.
diff --git
a/clang-tools-extra/docs/clang-tidy/checks/modernize/use-trailing-return-type.rst
b/clang-tools-extra/docs/clang-tidy/checks/modernize/use-trailing-return-type.rst
index 0593a35326aaa..e44d9cc1828ea 100644
---
a/clang-tools-extra/docs/clang-tidy/checks/modernize/use-trailing-return-type.rst
+++
b/clang-tools-extra/docs/clang-tidy/checks/modernize/use-trailing-return-type.rst
@@ -3,7 +3,7 @@
modernize-use-trailing-return-type
==================================
-Rewrites function signatures to use a trailing return type
+Rewrites function and lambda signatures to use a trailing return type
(introduced in C++11). This transformation is purely stylistic.
The return type before the function name is replaced by ``auto``
and inserted after the function parameter list (and qualifiers).
@@ -16,6 +16,7 @@ Example
int f1();
inline int f2(int arg) noexcept;
virtual float f3() const && = delete;
+ auto lambda = []() {};
transforms to:
@@ -24,6 +25,7 @@ transforms to:
auto f1() -> int;
inline auto f2(int arg) -> int noexcept;
virtual auto f3() const && -> float = delete;
+ auto lambda = []() -> void {};
Known Limitations
-----------------
@@ -66,3 +68,25 @@ a careless rewrite would produce the following output:
This code fails to compile because the S in the context of f refers to the
equally named function parameter.
Similarly, the S in the context of m refers to the equally named class member.
The check can currently only detect and avoid a clash with a function
parameter name.
+
+Options
+-------
+
+.. option:: TransformFunctions
+
+ When set to `true`, function declarations will be transformed to use trailing
+ return. Default is `true`.
+
+.. option:: TransformLambdas
+
+ Controls how lambda expressions are transformed to use trailing
+ return type. Possible values are:
+
+ * `All` - Transform all lambda expressions without an explicit return type
+ to use trailing return type. If type can not be deduced, ``auto`` will be
+ used in since C++14 and generic message will be emitted otherwise.
+ * `AllExceptAuto` - Transform all lambda expressions except those whose
return
+ type can not be deduced.
+ * `None` - Do not transform any lambda expressions.
+
+ Default is `All`.
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-cxx20.cpp
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-cxx20.cpp
index 72fdcc0177965..8a0618d154fd4 100644
---
a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-cxx20.cpp
+++
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-cxx20.cpp
@@ -1,4 +1,4 @@
-// RUN: %check_clang_tidy -std=c++20 %s modernize-use-trailing-return-type %t
+// RUN: %check_clang_tidy -std=c++20-or-later %s
modernize-use-trailing-return-type %t
namespace std {
template <typename T, typename U>
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-transform-lambdas-cxx14.cpp
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-transform-lambdas-cxx14.cpp
new file mode 100644
index 0000000000000..33051c63e4f17
--- /dev/null
+++
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-transform-lambdas-cxx14.cpp
@@ -0,0 +1,24 @@
+// RUN: %check_clang_tidy -std=c++14-or-later %s
modernize-use-trailing-return-type %t -- -- -fno-delayed-template-parsing
+
+namespace std {
+ template <typename T>
+ class vector {};
+
+ class string {};
+} // namespace std
+
+void test_lambda_positive() {
+ auto l1 = [](auto x) { return x; };
+ // CHECK-MESSAGES: :[[@LINE-1]]:13: warning: use a trailing return type for
this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES: {{^}} auto l1 = [](auto x) -> auto { return x; };{{$}}
+}
+
+template <template <typename> class C>
+void test_lambda_positive_template() {
+ auto l1 = []() { return C<int>{}; };
+ // CHECK-MESSAGES: :[[@LINE-1]]:13: warning: use a trailing return type for
this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES: {{^}} auto l1 = []() -> auto { return C<int>{}; };{{$}}
+ auto l2 = []() { return 0; };
+ // CHECK-MESSAGES: :[[@LINE-1]]:13: warning: use a trailing return type for
this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES: {{^}} auto l2 = []() -> auto { return 0; };{{$}}
+}
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-transform-lambdas-cxx20.cpp
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-transform-lambdas-cxx20.cpp
new file mode 100644
index 0000000000000..521b5c6d36184
--- /dev/null
+++
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-transform-lambdas-cxx20.cpp
@@ -0,0 +1,35 @@
+// RUN: %check_clang_tidy -std=c++20-or-later %s
modernize-use-trailing-return-type %t -- -- -fno-delayed-template-parsing
+
+namespace std {
+template <typename T, typename U>
+struct is_same { static constexpr auto value = false; };
+
+template <typename T>
+struct is_same<T, T> { static constexpr auto value = true; };
+
+template <typename T>
+concept floating_point = std::is_same<T, float>::value || std::is_same<T,
double>::value || std::is_same<T, long double>::value;
+}
+
+void test_lambda_positive() {
+ auto l1 = []<typename T, typename U>(T x, U y) { return x + y; };
+ // CHECK-MESSAGES: :[[@LINE-1]]:13: warning: use a trailing return type for
this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES: {{^}} auto l1 = []<typename T, typename U>(T x, U y) ->
auto { return x + y; };{{$}}
+ auto l2 = [](auto x) requires requires { x + x; } { return x; };
+ // CHECK-MESSAGES: :[[@LINE-1]]:13: warning: use a trailing return type for
this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES: {{^}} auto l2 = [](auto x) -> auto requires requires { x +
x; } { return x; };{{$}}
+ auto l3 = [](auto x) requires std::floating_point<decltype(x)> { return x; };
+ // CHECK-MESSAGES: :[[@LINE-1]]:13: warning: use a trailing return type for
this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES: {{^}} auto l3 = [](auto x) -> auto requires
std::floating_point<decltype(x)> { return x; };{{$}}
+ auto l4 = [](int x) consteval { return x; };
+ // CHECK-MESSAGES: :[[@LINE-1]]:13: warning: use a trailing return type for
this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES: {{^}} auto l4 = [](int x) consteval -> int { return x;
};{{$}}
+ // Complete complex example
+ auto l5 = []<typename T, typename U>(T x, U y) constexpr noexcept
+ requires std::floating_point<T> && std::floating_point<U>
+ { return x * y; };
+ // CHECK-MESSAGES: :[[@LINE-3]]:13: warning: use a trailing return type for
this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES: {{^}} auto l5 = []<typename T, typename U>(T x, U y)
constexpr noexcept{{$}}
+ // CHECK-FIXES: {{^}} -> auto requires std::floating_point<T> &&
std::floating_point<U>{{$}}
+ // CHECK-FIXES: {{^}} { return x * y; };{{$}}
+}
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-transform-lambdas.cpp
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-transform-lambdas.cpp
new file mode 100644
index 0000000000000..f3da7b2305d71
--- /dev/null
+++
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-transform-lambdas.cpp
@@ -0,0 +1,89 @@
+// RUN: %check_clang_tidy -check-suffix=ALL -std=c++11-or-later %s
modernize-use-trailing-return-type %t --\
+// RUN: -config="{CheckOptions:
{modernize-use-trailing-return-type.TransformLambdas: All, \
+// RUN:
modernize-use-trailing-return-type.TransformFunctions: false}}" \
+// RUN: -- -fno-delayed-template-parsing
+// RUN: %check_clang_tidy -check-suffix=NOAUTO -std=c++11-or-later %s
modernize-use-trailing-return-type %t --\
+// RUN: -config="{CheckOptions:
{modernize-use-trailing-return-type.TransformLambdas: AllExceptAuto, \
+// RUN:
modernize-use-trailing-return-type.TransformFunctions: false}}" \
+// RUN: -- -fno-delayed-template-parsing
+// RUN: %check_clang_tidy -check-suffix=NONE -std=c++11-or-later %s
modernize-use-trailing-return-type %t --\
+// RUN: -config="{CheckOptions:
{modernize-use-trailing-return-type.TransformLambdas: None, \
+// RUN:
modernize-use-trailing-return-type.TransformFunctions: true}}" \
+// RUN: -- -fno-delayed-template-parsing
+
+namespace std {
+ template <typename T>
+ class vector {};
+
+ class string {};
+} // namespace std
+
+void test_lambda_positive() {
+ auto l01 = [] {};
+ // CHECK-MESSAGES-ALL: :[[@LINE-1]]:14: warning: use a trailing return type
for this lambda [modernize-use-trailing-return-type]
+ // CHECK-MESSAGES-NOAUTO: :[[@LINE-2]]:14: warning: use a trailing return
type for this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES-ALL: {{^}} auto l01 = [] -> void {};{{$}}
+ auto l1 = []() {};
+ // CHECK-MESSAGES-ALL: :[[@LINE-1]]:13: warning: use a trailing return type
for this lambda [modernize-use-trailing-return-type]
+ // CHECK-MESSAGES-NOAUTO: :[[@LINE-2]]:13: warning: use a trailing return
type for this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES-ALL: {{^}} auto l1 = []() -> void {};{{$}}
+ auto l2 = []() { return 42; };
+ // CHECK-MESSAGES-ALL: :[[@LINE-1]]:13: warning: use a trailing return type
for this lambda [modernize-use-trailing-return-type]
+ // CHECK-MESSAGES-NOAUTO: :[[@LINE-2]]:13: warning: use a trailing return
type for this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES-ALL: {{^}} auto l2 = []() -> int { return 42; };{{$}}
+ auto l3 = [](int x, double y) { return x * y; };
+ // CHECK-MESSAGES-ALL: :[[@LINE-1]]:13: warning: use a trailing return type
for this lambda [modernize-use-trailing-return-type]
+ // CHECK-MESSAGES-NOAUTO: :[[@LINE-2]]:13: warning: use a trailing return
type for this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES-ALL: {{^}} auto l3 = [](int x, double y) -> double { return
x * y; };{{$}}
+
+ int capture_int = 10;
+ double capture_double = 3.14;
+ int* capture_ptr = nullptr;
+
+ auto l4 = [capture_int]() { return capture_int; };
+ // CHECK-MESSAGES-ALL: :[[@LINE-1]]:13: warning: use a trailing return type
for this lambda [modernize-use-trailing-return-type]
+ // CHECK-MESSAGES-NOAUTO: :[[@LINE-2]]:13: warning: use a trailing return
type for this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES-ALL: {{^}} auto l4 = [capture_int]() -> int { return
capture_int; };{{$}}
+ auto l5 = [capture_int, &capture_double](char c) { return capture_int +
capture_double + c; };
+ // CHECK-MESSAGES-ALL: :[[@LINE-1]]:13: warning: use a trailing return type
for this lambda [modernize-use-trailing-return-type]
+ // CHECK-MESSAGES-NOAUTO: :[[@LINE-2]]:13: warning: use a trailing return
type for this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES-ALL: {{^}} auto l5 = [capture_int, &capture_double](char c)
-> double { return capture_int + capture_double + c; };{{$}}
+ auto l6 = [capture_int]() constexpr mutable noexcept { return ++capture_int;
};
+ // CHECK-MESSAGES-ALL: :[[@LINE-1]]:13: warning: use a trailing return type
for this lambda [modernize-use-trailing-return-type]
+ // CHECK-MESSAGES-NOAUTO: :[[@LINE-2]]:13: warning: use a trailing return
type for this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES-ALL: {{^}} auto l6 = [capture_int]() constexpr mutable
noexcept -> int { return ++capture_int; };{{$}}
+ auto l7 = [&capture_ptr]() { return capture_ptr; };
+ // CHECK-MESSAGES-ALL: :[[@LINE-1]]:13: warning: use a trailing return type
for this lambda [modernize-use-trailing-return-type]
+ // CHECK-MESSAGES-NOAUTO: :[[@LINE-2]]:13: warning: use a trailing return
type for this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES-ALL: {{^}} auto l7 = [&capture_ptr]() -> int * { return
capture_ptr; };{{$}}
+ auto l8 = [&capture_int]() { return capture_int; };
+ // CHECK-MESSAGES-ALL: :[[@LINE-1]]:13: warning: use a trailing return type
for this lambda [modernize-use-trailing-return-type]
+ // CHECK-MESSAGES-NOAUTO: :[[@LINE-2]]:13: warning: use a trailing return
type for this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES-ALL: {{^}} auto l8 = [&capture_int]() -> int { return
capture_int; };{{$}}
+ auto l9 = [] { return std::vector<std::vector<int>>{}; };
+ // CHECK-MESSAGES-ALL: :[[@LINE-1]]:13: warning: use a trailing return type
for this lambda [modernize-use-trailing-return-type]
+ // CHECK-MESSAGES-NOAUTO: :[[@LINE-2]]:13: warning: use a trailing return
type for this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES-ALL: {{^}} auto l9 = [] -> std::vector<std::vector<int>> {
return std::vector<std::vector<int>>{}; };{{$}}
+ auto l10 = [] { const char* const * const * const ptr = nullptr; return ptr;
};
+ // CHECK-MESSAGES-ALL: :[[@LINE-1]]:14: warning: use a trailing return type
for this lambda [modernize-use-trailing-return-type]
+ // CHECK-MESSAGES-NOAUTO: :[[@LINE-2]]:14: warning: use a trailing return
type for this lambda [modernize-use-trailing-return-type]
+ // CHECK-FIXES-ALL: {{^}} auto l10 = [] -> const char *const *const * {
const char* const * const * const ptr = nullptr; return ptr; };{{$}}
+}
+
+// In c++11 mode we can not write 'auto' type, see *-cxx14.cpp for fixes.
+template <template <typename> class C>
+void test_lambda_positive_template() {
+ auto l1 = []() { return C<int>{}; };
+ // CHECK-MESSAGES-ALL: :[[@LINE-1]]:13: warning: use a trailing return type
for this lambda [modernize-use-trailing-return-type]
+ auto l2 = []() { return 0; };
+ // CHECK-MESSAGES-ALL: :[[@LINE-1]]:13: warning: use a trailing return type
for this lambda [modernize-use-trailing-return-type]
+}
+
+void test_lambda_negative() {
+ auto l1_good = [](int arg) -> int { return 0; };
+}
+
+// this function is solely used to not to get "wrong config error" from the
check.
+int f();
+// CHECK-MESSAGES-NONE: :[[@LINE-1]]:5: warning: use a trailing return type
for this function [modernize-use-trailing-return-type]
+// CHECK-FIXES-NONE: {{^}}auto f() -> int;{{$}}
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-wrong-config.cpp
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-wrong-config.cpp
new file mode 100644
index 0000000000000..41a4ad235adee
--- /dev/null
+++
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type-wrong-config.cpp
@@ -0,0 +1,5 @@
+// RUN: %check_clang_tidy -std=c++11-or-later %s
modernize-use-trailing-return-type %t \
+// RUN: -config="{CheckOptions:
{modernize-use-trailing-return-type.TransformLambdas: None, \
+// RUN:
modernize-use-trailing-return-type.TransformFunctions: false}}"
+
+// CHECK-MESSAGES: warning: The check 'modernize-use-trailing-return-type'
will not perform any analysis because 'TransformFunctions' and
'TransformLambdas' are disabled. [clang-tidy-config]
diff --git
a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type.cpp
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type.cpp
index e1f36c52a7c01..c16c033f0b016 100644
---
a/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type.cpp
+++
b/clang-tools-extra/test/clang-tidy/checkers/modernize/use-trailing-return-type.cpp
@@ -594,5 +594,3 @@ struct D2 : B {
operator double();
};
-auto l1 = [](int arg) {};
-auto l2 = [](int arg) -> double { return 0; };
>From 8221158f4ad8a29e1a68e97b4b278c3b89545d38 Mon Sep 17 00:00:00 2001
From: Victor Baranov <bar.victor.2...@gmail.com>
Date: Fri, 18 Apr 2025 10:03:31 +0300
Subject: [PATCH 2/4] fix small style issues
---
.../modernize/UseTrailingReturnTypeCheck.cpp | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git
a/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
index 4191c94f54a47..2fc7eb40f44a2 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
@@ -448,10 +448,9 @@ void
UseTrailingReturnTypeCheck::registerMatchers(MatchFinder *Finder) {
Finder->addMatcher(friendDecl(hasDescendant(F)).bind("Friend"), this);
}
- if (TransformLambdas != TransformLambda::None) {
+ if (TransformLambdas != TransformLambda::None)
Finder->addMatcher(
lambdaExpr(unless(hasExplicitResultType())).bind("Lambda"), this);
- }
}
void UseTrailingReturnTypeCheck::registerPPCallbacks(
@@ -603,11 +602,10 @@ SourceLocation
UseTrailingReturnTypeCheck::findLambdaTrailingReturnInsertLoc(
// 'requires' keyword is present in lambda declaration
if (Method->getTrailingRequiresClause()) {
SourceLocation ParamEndLoc;
- if (Method->param_empty()) {
+ if (Method->param_empty())
ParamEndLoc = Method->getBeginLoc();
- } else {
+ else
ParamEndLoc = Method->getParametersSourceRange().getEnd();
- }
std::pair<FileID, unsigned> ParamEndLocInfo =
SM.getDecomposedLoc(ParamEndLoc);
@@ -626,9 +624,8 @@ SourceLocation
UseTrailingReturnTypeCheck::findLambdaTrailingReturnInsertLoc(
Token.setKind(Info.getTokenID());
}
- if (Token.is(tok::kw_requires)) {
+ if (Token.is(tok::kw_requires))
return Token.getLocation().getLocWithOffset(-1);
- }
}
return {};
>From c616270f4b2a45fb30d1727a5d94577aa49e91f4 Mon Sep 17 00:00:00 2001
From: Baranov Victor <bar.victor.2...@gmail.com>
Date: Mon, 19 May 2025 19:30:17 +0300
Subject: [PATCH 3/4] [clang-tidy] refactor UseTrailingReturnType methods to
static functions.
---
.../modernize/UseTrailingReturnTypeCheck.cpp | 133 +++++++++---------
.../modernize/UseTrailingReturnTypeCheck.h | 21 ---
2 files changed, 69 insertions(+), 85 deletions(-)
diff --git
a/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
index 2fc7eb40f44a2..048383512eae7 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
@@ -156,7 +156,7 @@ static SourceLocation expandIfMacroId(SourceLocation Loc,
return Loc;
}
-SourceLocation
UseTrailingReturnTypeCheck::findTrailingReturnTypeSourceLocation(
+static SourceLocation findTrailingReturnTypeSourceLocation(
const FunctionDecl &F, const FunctionTypeLoc &FTL, const ASTContext &Ctx,
const SourceManager &SM, const LangOptions &LangOpts) {
// We start with the location of the closing parenthesis.
@@ -248,10 +248,11 @@ classifyToken(const FunctionDecl &F, Preprocessor &PP,
Token Tok) {
return CT;
}
-std::optional<SmallVector<ClassifiedToken, 8>>
-UseTrailingReturnTypeCheck::classifyTokensBeforeFunctionName(
- const FunctionDecl &F, const ASTContext &Ctx, const SourceManager &SM,
- const LangOptions &LangOpts) {
+static std::optional<SmallVector<ClassifiedToken, 8>>
+classifyTokensBeforeFunctionName(const FunctionDecl &F, const ASTContext &Ctx,
+ const SourceManager &SM,
+ const LangOptions &LangOpts,
+ Preprocessor *PP) {
SourceLocation BeginF = expandIfMacroId(F.getBeginLoc(), SM);
SourceLocation BeginNameF = expandIfMacroId(F.getLocation(), SM);
@@ -273,7 +274,7 @@
UseTrailingReturnTypeCheck::classifyTokensBeforeFunctionName(
const MacroInfo *MI = PP->getMacroInfo(&Info);
if (!MI || MI->isFunctionLike()) {
// Cannot handle function style macros.
- diag(F.getLocation(), MessageFunction);
+ // diag(F.getLocation(), MessageFunction);
return std::nullopt;
}
}
@@ -285,7 +286,7 @@
UseTrailingReturnTypeCheck::classifyTokensBeforeFunctionName(
if (std::optional<ClassifiedToken> CT = classifyToken(F, *PP, T))
ClassifiedTokens.push_back(*CT);
else {
- diag(F.getLocation(), MessageFunction);
+ // diag(F.getLocation(), MessageFunction);
return std::nullopt;
}
}
@@ -304,9 +305,10 @@ static bool hasAnyNestedLocalQualifiers(QualType Type) {
return Result;
}
-SourceRange UseTrailingReturnTypeCheck::findReturnTypeAndCVSourceRange(
- const FunctionDecl &F, const TypeLoc &ReturnLoc, const ASTContext &Ctx,
- const SourceManager &SM, const LangOptions &LangOpts) {
+static SourceRange
+findReturnTypeAndCVSourceRange(const FunctionDecl &F, const TypeLoc &ReturnLoc,
+ const ASTContext &Ctx, const SourceManager &SM,
+ const LangOptions &LangOpts, Preprocessor *PP) {
// We start with the range of the return type and expand to neighboring
// qualifiers (const, volatile and restrict).
@@ -314,7 +316,7 @@ SourceRange
UseTrailingReturnTypeCheck::findReturnTypeAndCVSourceRange(
if (ReturnTypeRange.isInvalid()) {
// Happens if e.g. clang cannot resolve all includes and the return type is
// unknown.
- diag(F.getLocation(), MessageFunction);
+ // diag(F.getLocation(), MessageFunction);
return {};
}
@@ -325,7 +327,7 @@ SourceRange
UseTrailingReturnTypeCheck::findReturnTypeAndCVSourceRange(
// Include qualifiers to the left and right of the return type.
std::optional<SmallVector<ClassifiedToken, 8>> MaybeTokens =
- classifyTokensBeforeFunctionName(F, Ctx, SM, LangOpts);
+ classifyTokensBeforeFunctionName(F, Ctx, SM, LangOpts, PP);
if (!MaybeTokens)
return {};
const SmallVector<ClassifiedToken, 8> &Tokens = *MaybeTokens;
@@ -362,10 +364,53 @@ SourceRange
UseTrailingReturnTypeCheck::findReturnTypeAndCVSourceRange(
return ReturnTypeRange;
}
-void UseTrailingReturnTypeCheck::keepSpecifiers(
- std::string &ReturnType, std::string &Auto, SourceRange ReturnTypeCVRange,
- const FunctionDecl &F, const FriendDecl *Fr, const ASTContext &Ctx,
- const SourceManager &SM, const LangOptions &LangOpts) {
+static SourceLocation findLambdaTrailingReturnInsertLoc(
+ const CXXMethodDecl *Method, const SourceManager &SM,
+ const LangOptions &LangOpts, const ASTContext &Ctx) {
+ // 'requires' keyword is present in lambda declaration
+ if (Method->getTrailingRequiresClause()) {
+ SourceLocation ParamEndLoc;
+ if (Method->param_empty())
+ ParamEndLoc = Method->getBeginLoc();
+ else
+ ParamEndLoc = Method->getParametersSourceRange().getEnd();
+
+ std::pair<FileID, unsigned> ParamEndLocInfo =
+ SM.getDecomposedLoc(ParamEndLoc);
+ StringRef Buffer = SM.getBufferData(ParamEndLocInfo.first);
+
+ Lexer Lexer(SM.getLocForStartOfFile(ParamEndLocInfo.first), LangOpts,
+ Buffer.begin(), Buffer.data() + ParamEndLocInfo.second,
+ Buffer.end());
+
+ Token Token;
+ while (!Lexer.LexFromRawLexer(Token)) {
+ if (Token.is(tok::raw_identifier)) {
+ IdentifierInfo &Info = Ctx.Idents.get(StringRef(
+ SM.getCharacterData(Token.getLocation()), Token.getLength()));
+ Token.setIdentifierInfo(&Info);
+ Token.setKind(Info.getTokenID());
+ }
+
+ if (Token.is(tok::kw_requires))
+ return Token.getLocation().getLocWithOffset(-1);
+ }
+
+ return {};
+ }
+
+ // If no requires clause, insert before the body
+ if (const Stmt *Body = Method->getBody())
+ return Body->getBeginLoc().getLocWithOffset(-1);
+
+ return {};
+}
+
+static void keepSpecifiers(std::string &ReturnType, std::string &Auto,
+ SourceRange ReturnTypeCVRange, const FunctionDecl
&F,
+ const FriendDecl *Fr, const ASTContext &Ctx,
+ const SourceManager &SM, const LangOptions
&LangOpts,
+ Preprocessor *PP) {
// Check if there are specifiers inside the return type. E.g. unsigned
// inline int.
const auto *M = dyn_cast<CXXMethodDecl>(&F);
@@ -377,7 +422,7 @@ void UseTrailingReturnTypeCheck::keepSpecifiers(
// Tokenize return type. If it contains macros which contain a mix of
// qualifiers, specifiers and types, give up.
std::optional<SmallVector<ClassifiedToken, 8>> MaybeTokens =
- classifyTokensBeforeFunctionName(F, Ctx, SM, LangOpts);
+ classifyTokensBeforeFunctionName(F, Ctx, SM, LangOpts, PP);
if (!MaybeTokens)
return;
@@ -519,10 +564,12 @@ void UseTrailingReturnTypeCheck::check(const
MatchFinder::MatchResult &Result) {
// Using the declared return type via
F->getDeclaredReturnType().getAsString()
// discards user formatting and order of const, volatile, type, whitespace,
// space before & ... .
- SourceRange ReturnTypeCVRange =
- findReturnTypeAndCVSourceRange(*F, FTL.getReturnLoc(), Ctx, SM,
LangOpts);
- if (ReturnTypeCVRange.isInvalid())
+ SourceRange ReturnTypeCVRange = findReturnTypeAndCVSourceRange(
+ *F, FTL.getReturnLoc(), Ctx, SM, LangOpts, PP);
+ if (ReturnTypeCVRange.isInvalid()) {
+ diag(F->getLocation(), MessageFunction);
return;
+ }
// Check if unqualified names in the return type conflict with other entities
// after the rewrite.
@@ -551,8 +598,8 @@ void UseTrailingReturnTypeCheck::check(const
MatchFinder::MatchResult &Result) {
std::string Auto = NeedSpaceAfterAuto ? "auto " : "auto";
std::string ReturnType =
std::string(tooling::fixit::getText(ReturnTypeCVRange, Ctx));
- keepSpecifiers(ReturnType, Auto, ReturnTypeCVRange, *F, Fr, Ctx, SM,
- LangOpts);
+ keepSpecifiers(ReturnType, Auto, ReturnTypeCVRange, *F, Fr, Ctx, SM,
LangOpts,
+ PP);
diag(F->getLocation(), MessageFunction)
<< FixItHint::CreateReplacement(ReturnTypeCVRange, Auto)
@@ -596,46 +643,4 @@ void UseTrailingReturnTypeCheck::diagOnLambda(
diag(Lambda->getBeginLoc(), MessageLambda);
}
-SourceLocation UseTrailingReturnTypeCheck::findLambdaTrailingReturnInsertLoc(
- const CXXMethodDecl *Method, const SourceManager &SM,
- const LangOptions &LangOpts, const ASTContext &Ctx) {
- // 'requires' keyword is present in lambda declaration
- if (Method->getTrailingRequiresClause()) {
- SourceLocation ParamEndLoc;
- if (Method->param_empty())
- ParamEndLoc = Method->getBeginLoc();
- else
- ParamEndLoc = Method->getParametersSourceRange().getEnd();
-
- std::pair<FileID, unsigned> ParamEndLocInfo =
- SM.getDecomposedLoc(ParamEndLoc);
- StringRef Buffer = SM.getBufferData(ParamEndLocInfo.first);
-
- Lexer Lexer(SM.getLocForStartOfFile(ParamEndLocInfo.first), LangOpts,
- Buffer.begin(), Buffer.data() + ParamEndLocInfo.second,
- Buffer.end());
-
- Token Token;
- while (!Lexer.LexFromRawLexer(Token)) {
- if (Token.is(tok::raw_identifier)) {
- IdentifierInfo &Info = Ctx.Idents.get(StringRef(
- SM.getCharacterData(Token.getLocation()), Token.getLength()));
- Token.setIdentifierInfo(&Info);
- Token.setKind(Info.getTokenID());
- }
-
- if (Token.is(tok::kw_requires))
- return Token.getLocation().getLocWithOffset(-1);
- }
-
- return {};
- }
-
- // If no requires clause, insert before the body
- if (const Stmt *Body = Method->getBody())
- return Body->getBeginLoc().getLocWithOffset(-1);
-
- return {};
-}
-
} // namespace clang::tidy::modernize
diff --git
a/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.h
b/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.h
index 5a340707e8558..d2fa11888bde8 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.h
+++ b/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.h
@@ -44,29 +44,8 @@ class UseTrailingReturnTypeCheck : public ClangTidyCheck {
const bool TransformFunctions;
const TransformLambda TransformLambdas;
- SourceLocation findTrailingReturnTypeSourceLocation(
- const FunctionDecl &F, const FunctionTypeLoc &FTL, const ASTContext &Ctx,
- const SourceManager &SM, const LangOptions &LangOpts);
- std::optional<SmallVector<ClassifiedToken, 8>>
- classifyTokensBeforeFunctionName(const FunctionDecl &F, const ASTContext
&Ctx,
- const SourceManager &SM,
- const LangOptions &LangOpts);
- SourceRange findReturnTypeAndCVSourceRange(const FunctionDecl &F,
- const TypeLoc &ReturnLoc,
- const ASTContext &Ctx,
- const SourceManager &SM,
- const LangOptions &LangOpts);
- void keepSpecifiers(std::string &ReturnType, std::string &Auto,
- SourceRange ReturnTypeCVRange, const FunctionDecl &F,
- const FriendDecl *Fr, const ASTContext &Ctx,
- const SourceManager &SM, const LangOptions &LangOpts);
-
void diagOnLambda(const LambdaExpr *Lambda,
const ast_matchers::MatchFinder::MatchResult &Result);
- SourceLocation findLambdaTrailingReturnInsertLoc(const CXXMethodDecl *Method,
- const SourceManager &SM,
- const LangOptions &LangOpts,
- const ASTContext &Ctx);
};
} // namespace clang::tidy::modernize
>From 8aee876ff8c1275f48dc0c25e579eeff77f6fdf5 Mon Sep 17 00:00:00 2001
From: Baranov Victor <bar.victor.2...@gmail.com>
Date: Mon, 19 May 2025 19:34:59 +0300
Subject: [PATCH 4/4] [clang-tidy] clean UseTrailingReturnType code
---
.../clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp | 3 ---
.../clang-tidy/modernize/UseTrailingReturnTypeCheck.h | 1 -
2 files changed, 4 deletions(-)
diff --git
a/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
b/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
index 048383512eae7..282624a6a753c 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.cpp
@@ -274,7 +274,6 @@ classifyTokensBeforeFunctionName(const FunctionDecl &F,
const ASTContext &Ctx,
const MacroInfo *MI = PP->getMacroInfo(&Info);
if (!MI || MI->isFunctionLike()) {
// Cannot handle function style macros.
- // diag(F.getLocation(), MessageFunction);
return std::nullopt;
}
}
@@ -286,7 +285,6 @@ classifyTokensBeforeFunctionName(const FunctionDecl &F,
const ASTContext &Ctx,
if (std::optional<ClassifiedToken> CT = classifyToken(F, *PP, T))
ClassifiedTokens.push_back(*CT);
else {
- // diag(F.getLocation(), MessageFunction);
return std::nullopt;
}
}
@@ -316,7 +314,6 @@ findReturnTypeAndCVSourceRange(const FunctionDecl &F, const
TypeLoc &ReturnLoc,
if (ReturnTypeRange.isInvalid()) {
// Happens if e.g. clang cannot resolve all includes and the return type is
// unknown.
- // diag(F.getLocation(), MessageFunction);
return {};
}
diff --git
a/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.h
b/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.h
index d2fa11888bde8..91369919c5d36 100644
--- a/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.h
+++ b/clang-tools-extra/clang-tidy/modernize/UseTrailingReturnTypeCheck.h
@@ -11,7 +11,6 @@
#include "../ClangTidyCheck.h"
#include "clang/Lex/Token.h"
-#include <optional>
namespace clang::tidy::modernize {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
