diff options
| author | Piotr Zegar <me@piotrzegar.pl> | 2023-12-06 20:48:56 +0000 |
|---|---|---|
| committer | Piotr Zegar <me@piotrzegar.pl> | 2023-12-06 20:50:48 +0000 |
| commit | e1fa2fea03ff94627008054267a244744d76b5c2 (patch) | |
| tree | eb0ae3c463ed659e1c07fb51bbf8a8f753a4a211 /clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp | |
| parent | 0eb7d53cfc48f2e9287bb116415620618ca850b7 (diff) | |
| download | llvm-e1fa2fea03ff94627008054267a244744d76b5c2.zip llvm-e1fa2fea03ff94627008054267a244744d76b5c2.tar.gz llvm-e1fa2fea03ff94627008054267a244744d76b5c2.tar.bz2 | |
[clang-tidy][NFC] Change ArrayRef into std::vector in modernize-use-std-numbers
To avoid compiler errors on some platforms introduced
by #66583, now using std::vector to pass list of
matchers into main matcher, and removed static variable
as it could introduce some other issues.
Diffstat (limited to 'clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp')
| -rw-r--r-- | clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp index 1f2b034..b299afd 100644 --- a/clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp @@ -23,7 +23,6 @@ #include "clang/Basic/SourceLocation.h" #include "clang/Basic/SourceManager.h" #include "clang/Lex/Lexer.h" -#include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" @@ -61,8 +60,8 @@ AST_MATCHER(clang::QualType, isFloating) { return !Node.isNull() && Node->isFloatingType(); } -AST_MATCHER_P(clang::Expr, anyOfExhaustive, - llvm::ArrayRef<Matcher<clang::Stmt>>, Exprs) { +AST_MATCHER_P(clang::Expr, anyOfExhaustive, std::vector<Matcher<clang::Stmt>>, + Exprs) { bool FoundMatch = false; for (const auto &InnerMatcher : Exprs) { clang::ast_matchers::internal::BoundNodesTreeBuilder Result = *Builder; @@ -304,7 +303,7 @@ UseStdNumbersCheck::UseStdNumbersCheck(const StringRef Name, void UseStdNumbersCheck::registerMatchers(MatchFinder *const Finder) { const auto Matches = MatchBuilder{DiffThreshold}; - static const auto ConstantMatchers = { + std::vector<Matcher<clang::Stmt>> ConstantMatchers = { Matches.matchLog2Euler(), Matches.matchLog10Euler(), Matches.matchEulerTopLevel(), Matches.matchEgamma(), Matches.matchInvSqrtPi(), Matches.matchInvPi(), @@ -316,7 +315,7 @@ void UseStdNumbersCheck::registerMatchers(MatchFinder *const Finder) { Finder->addMatcher( expr( - anyOfExhaustive(ConstantMatchers), + anyOfExhaustive(std::move(ConstantMatchers)), unless(hasParent(explicitCastExpr(hasDestinationType(isFloating())))), hasType(qualType(hasCanonicalTypeUnqualified( anyOf(qualType(asString("float")).bind("float"), |