Skip to content
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
cb748c3
[clang-tidy] Add modernize-use-span-first-last check
hjanuschka Nov 29, 2024
ec5a6b0
format
hjanuschka Nov 29, 2024
5cf1b7c
format
hjanuschka Nov 29, 2024
b357f8c
format
hjanuschka Nov 29, 2024
42d1df2
format
hjanuschka Nov 29, 2024
04f3edc
format
hjanuschka Nov 29, 2024
2f9cc3e
format
hjanuschka Nov 29, 2024
24690e3
up
hjanuschka Nov 29, 2024
39833d4
up
hjanuschka Nov 29, 2024
964fadc
format
hjanuschka Nov 29, 2024
79afa9e
format
hjanuschka Nov 29, 2024
31d300f
format
hjanuschka Nov 29, 2024
c7fd4d5
format
hjanuschka Nov 29, 2024
4a9fc6e
Update clang-tools-extra/clang-tidy/readability/UseSpanFirstLastCheck…
hjanuschka Dec 2, 2024
3f604e5
Update clang-tools-extra/clang-tidy/readability/UseSpanFirstLastCheck.h
hjanuschka Dec 2, 2024
7e2aaa4
feed
hjanuschka Dec 2, 2024
b2e82cf
Merge branch 'subspan' of github.com:hjanuschka/llvm-project into sub…
hjanuschka Dec 2, 2024
c707971
up
hjanuschka Dec 2, 2024
cd2fce3
feedback
hjanuschka Dec 2, 2024
72610ac
feedback
hjanuschka Dec 2, 2024
b565ef7
feedback
hjanuschka Dec 2, 2024
3e9b0c6
feedback
hjanuschka Dec 3, 2024
2c65d52
feedback
hjanuschka Dec 3, 2024
8c16f74
up
hjanuschka Dec 4, 2024
514ac50
up
hjanuschka Dec 5, 2024
86b467b
up
hjanuschka Dec 5, 2024
6ab0051
up
hjanuschka Dec 5, 2024
39da599
up
hjanuschka Dec 11, 2024
8ba6771
feedback
hjanuschka Dec 11, 2024
79702fb
feedback
hjanuschka Dec 11, 2024
0a1d6cb
feedback
hjanuschka Dec 14, 2024
3354841
feedback
hjanuschka Dec 14, 2024
1fc1375
feedback
hjanuschka Dec 20, 2024
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
1 change: 1 addition & 0 deletions clang-tools-extra/clang-tidy/modernize/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ add_clang_library(clangTidyModernizeModule STATIC
UseTransparentFunctorsCheck.cpp
UseUncaughtExceptionsCheck.cpp
UseUsingCheck.cpp
UseSpanFirstLastCheck.cpp

LINK_LIBS
clangTidy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#include "UseNullptrCheck.h"
#include "UseOverrideCheck.h"
#include "UseRangesCheck.h"
#include "UseSpanFirstLastCheck.h"
#include "UseStartsEndsWithCheck.h"
#include "UseStdFormatCheck.h"
#include "UseStdNumbersCheck.h"
Expand Down Expand Up @@ -122,6 +123,9 @@ class ModernizeModule : public ClangTidyModule {
CheckFactories.registerCheck<UseUncaughtExceptionsCheck>(
"modernize-use-uncaught-exceptions");
CheckFactories.registerCheck<UseUsingCheck>("modernize-use-using");
CheckFactories.registerCheck<UseSpanFirstLastCheck>(
"modernize-use-span-first-last");

}
};

Expand Down
98 changes: 98 additions & 0 deletions clang-tools-extra/clang-tidy/modernize/UseSpanFirstLastCheck.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
//===--- UseSpanFirstLastCheck.cpp - clang-tidy-----------------*- C++ -*-===//
//
// 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 "UseSpanFirstLastCheck.h"
#include "clang/AST/ASTContext.h"
#include "clang/ASTMatchers/ASTMatchFinder.h"
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Lex/Lexer.h"

using namespace clang::ast_matchers;

namespace clang::tidy::modernize {

void UseSpanFirstLastCheck::registerMatchers(MatchFinder *Finder) {
// Match span::subspan calls
const auto HasSpanType =
hasType(hasUnqualifiedDesugaredType(recordType(hasDeclaration(
classTemplateSpecializationDecl(hasName("::std::span"))))));

Finder->addMatcher(cxxMemberCallExpr(callee(memberExpr(hasDeclaration(
cxxMethodDecl(hasName("subspan"))))),
on(expr(HasSpanType)))
.bind("subspan"),
this);
}

void UseSpanFirstLastCheck::check(const MatchFinder::MatchResult &Result) {
const auto *Call = Result.Nodes.getNodeAs<CXXMemberCallExpr>("subspan");
if (!Call)
return;

handleSubspanCall(Result, Call);
}

void UseSpanFirstLastCheck::handleSubspanCall(
const MatchFinder::MatchResult &Result, const CXXMemberCallExpr *Call) {
// Get arguments
unsigned NumArgs = Call->getNumArgs();
if (NumArgs == 0 || NumArgs > 2)
return;

const Expr *Offset = Call->getArg(0);
const Expr *Count = NumArgs > 1 ? Call->getArg(1) : nullptr;
auto &Context = *Result.Context;
bool IsZeroOffset = false;

// Check if offset is zero through any implicit casts
const Expr *OffsetE = Offset->IgnoreImpCasts();
if (const auto *IL = dyn_cast<IntegerLiteral>(OffsetE)) {
IsZeroOffset = IL->getValue() == 0;
}

// Build replacement text
std::string Replacement;
if (IsZeroOffset && Count) {
// subspan(0, count) -> first(count)
auto CountStr = Lexer::getSourceText(
CharSourceRange::getTokenRange(Count->getSourceRange()),
Context.getSourceManager(), Context.getLangOpts());
const auto *Base =
cast<CXXMemberCallExpr>(Call)->getImplicitObjectArgument();
auto BaseStr = Lexer::getSourceText(
CharSourceRange::getTokenRange(Base->getSourceRange()),
Context.getSourceManager(), Context.getLangOpts());
Replacement = BaseStr.str() + ".first(" + CountStr.str() + ")";
} else if (NumArgs == 1) {
// subspan(n) -> last(size() - n)
auto OffsetStr = Lexer::getSourceText(
CharSourceRange::getTokenRange(Offset->getSourceRange()),
Context.getSourceManager(), Context.getLangOpts());

const auto *Base =
cast<CXXMemberCallExpr>(Call)->getImplicitObjectArgument();
auto BaseStr = Lexer::getSourceText(
CharSourceRange::getTokenRange(Base->getSourceRange()),
Context.getSourceManager(), Context.getLangOpts());

Replacement = BaseStr.str() + ".last(" + BaseStr.str() + ".size() - " +
OffsetStr.str() + ")";
}

if (!Replacement.empty()) {
if (IsZeroOffset && Count) {
diag(Call->getBeginLoc(), "prefer span::first() over subspan()")
<< FixItHint::CreateReplacement(Call->getSourceRange(), Replacement);
} else {
diag(Call->getBeginLoc(), "prefer span::last() over subspan()")
<< FixItHint::CreateReplacement(Call->getSourceRange(), Replacement);
}
}
}

} // namespace clang::tidy::modernize
40 changes: 40 additions & 0 deletions clang-tools-extra/clang-tidy/modernize/UseSpanFirstLastCheck.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
//===--- UseSpanFirstLastCheck.h - clang-tidy-------------------*- C++ -*-===//
//
// 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_MODERNIZE_USESPANFIRSTLASTCHECK_H
#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MODERNIZE_USESPANFIRSTLASTCHECK_H

#include "../ClangTidyCheck.h"

namespace clang::tidy::modernize {

/// Converts std::span::subspan() calls to the more modern first()/last()
/// methods where applicable.
///
/// For example:
/// \code
/// std::span<int> s = ...;
/// auto sub = s.subspan(0, n); // -> auto sub = s.first(n);
/// auto sub2 = s.subspan(n); // -> auto sub2 = s.last(s.size() - n);
/// \endcode
class UseSpanFirstLastCheck : public ClangTidyCheck {
public:
UseSpanFirstLastCheck(StringRef Name, ClangTidyContext *Context)
: ClangTidyCheck(Name, Context) {}

void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;

private:
void handleSubspanCall(const ast_matchers::MatchFinder::MatchResult &Result,
const CXXMemberCallExpr *Call);
};

} // namespace clang::tidy::modernize

#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MODERNIZE_USESPANFIRSTLASTCHECK_H
4 changes: 4 additions & 0 deletions clang-tools-extra/docs/ReleaseNotes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ New checks
New check aliases
^^^^^^^^^^^^^^^^^

- New check `modernize-use-span-first-last` has been added that suggests using
``std::span::first()`` and ``std::span::last()`` member functions instead of
equivalent ``subspan()``.

- New alias :doc:`cert-arr39-c <clang-tidy/checks/cert/arr39-c>` to
:doc:`bugprone-sizeof-expression
<clang-tidy/checks/bugprone/sizeof-expression>` was added.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.. title:: clang-tidy - modernize-use-span-first-last

modernize-use-span-first-last
============================

Checks for uses of ``std::span::subspan()`` that can be replaced with clearer
``first()`` or ``last()`` member functions.

Covered scenarios:

==================================== ==================================
Expression Replacement
------------------------------------ ----------------------------------
``s.subspan(0, n)`` ``s.first(n)``
``s.subspan(n)`` ``s.last(s.size() - n)``
==================================== ==================================

Non-zero offset with count (like ``subspan(1, n)``) has no direct equivalent
using ``first()`` or ``last()``, so these cases are not transformed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
// RUN: %check_clang_tidy %s modernize-use-span-first-last %t

namespace std {
template <typename T>
class span {
T* ptr;
__SIZE_TYPE__ len;

public:
span(T* p, __SIZE_TYPE__ l) : ptr(p), len(l) {}

span<T> subspan(__SIZE_TYPE__ offset) const {
return span(ptr + offset, len - offset);
}

span<T> subspan(__SIZE_TYPE__ offset, __SIZE_TYPE__ count) const {
return span(ptr + offset, count);
}

span<T> first(__SIZE_TYPE__ count) const {
return span(ptr, count);
}

span<T> last(__SIZE_TYPE__ count) const {
return span(ptr + (len - count), count);
}

__SIZE_TYPE__ size() const { return len; }
};
} // namespace std

void test() {
int arr[] = {1, 2, 3, 4, 5};
std::span<int> s(arr, 5);

auto sub1 = s.subspan(0, 3);
// CHECK-MESSAGES: :[[@LINE-1]]:15: warning: prefer span::first() over subspan()
// CHECK-FIXES: auto sub1 = s.first(3);

auto sub2 = s.subspan(2);
// CHECK-MESSAGES: :[[@LINE-1]]:15: warning: prefer span::last() over subspan()
// CHECK-FIXES: auto sub2 = s.last(s.size() - 2);

__SIZE_TYPE__ n = 2;
auto sub3 = s.subspan(0, n);
// CHECK-MESSAGES: :[[@LINE-1]]:15: warning: prefer span::first() over subspan()
// CHECK-FIXES: auto sub3 = s.first(n);

auto sub4 = s.subspan(1, 2); // No warning
}
Loading