Skip to content

Commit 64d7d69

Browse files
vbvictorvbvictor
committed
[clang-tidy][NFC] Fix llvm-prefer-static-over-anonymous-namespace warnings 3/N
1 parent b4b7aae commit 64d7d69

File tree

11 files changed

+66
-65
lines changed

11 files changed

+66
-65
lines changed

‎clang-tools-extra/clang-tidy/android/CloexecCheck.cpp‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ using namespace clang::ast_matchers;
1616

1717
namespace clang::tidy::android {
1818

19-
namespace {
2019
// Helper function to form the correct string mode for Type3.
2120
// Build the replace text. If it's string constant, add <Mode> directly in the
2221
// end of the string. Else, add <Mode>.
23-
std::string buildFixMsgForStringFlag(const Expr *Arg, const SourceManager &SM,
24-
const LangOptions &LangOpts, char Mode) {
22+
static std::string buildFixMsgForStringFlag(const Expr *Arg,
23+
const SourceManager &SM,
24+
const LangOptions &LangOpts,
25+
char Mode) {
2526
if (Arg->getBeginLoc().isMacroID())
2627
return (Lexer::getSourceText(
2728
CharSourceRange::getTokenRange(Arg->getSourceRange()), SM,
@@ -32,11 +33,6 @@ std::string buildFixMsgForStringFlag(const Expr *Arg, const SourceManager &SM,
3233
StringRef SR = cast<StringLiteral>(Arg->IgnoreParenCasts())->getString();
3334
return ("\"" + SR + Twine(Mode) + "\"").str();
3435
}
35-
} // namespace
36-
37-
const char *CloexecCheck::FuncDeclBindingStr = "funcDecl";
38-
39-
const char *CloexecCheck::FuncBindingStr = "func";
4036

4137
void CloexecCheck::registerMatchersImpl(
4238
MatchFinder *Finder, internal::Matcher<FunctionDecl> Function) {

‎clang-tools-extra/clang-tidy/android/CloexecCheck.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ class CloexecCheck : public ClangTidyCheck {
8989
int N) const;
9090

9191
/// Binding name of the FuncDecl of a function call.
92-
static const char *FuncDeclBindingStr;
92+
static constexpr char FuncDeclBindingStr[] = "funcDecl";
9393

9494
/// Binding name of the function call expression.
95-
static const char *FuncBindingStr;
95+
static constexpr char FuncBindingStr[] = "func";
9696
};
9797

9898
} // namespace clang::tidy::android

‎clang-tools-extra/clang-tidy/bugprone/SignalHandlerCheck.cpp‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -245,12 +245,10 @@ struct OptionEnumMapping<
245245

246246
namespace bugprone {
247247

248-
namespace {
249-
250248
/// Returns if a function is declared inside a system header.
251249
/// These functions are considered to be "standard" (system-provided) library
252250
/// functions.
253-
bool isStandardFunction(const FunctionDecl *FD) {
251+
static bool isStandardFunction(const FunctionDecl *FD) {
254252
// Find a possible redeclaration in system header.
255253
// FIXME: Looking at the canonical declaration is not the most exact way
256254
// to do this.
@@ -284,7 +282,7 @@ bool isStandardFunction(const FunctionDecl *FD) {
284282
/// Check if a statement is "C++-only".
285283
/// This includes all statements that have a class name with "CXX" prefix
286284
/// and every other statement that is declared in file ExprCXX.h.
287-
bool isCXXOnlyStmt(const Stmt *S) {
285+
static bool isCXXOnlyStmt(const Stmt *S) {
288286
StringRef Name = S->getStmtClassName();
289287
if (Name.starts_with("CXX"))
290288
return true;
@@ -304,7 +302,8 @@ bool isCXXOnlyStmt(const Stmt *S) {
304302
/// called from \p Caller, get a \c CallExpr of the corresponding function call.
305303
/// It is unspecified which call is found if multiple calls exist, but the order
306304
/// should be deterministic (depend only on the AST).
307-
Expr *findCallExpr(const CallGraphNode *Caller, const CallGraphNode *Callee) {
305+
static Expr *findCallExpr(const CallGraphNode *Caller,
306+
const CallGraphNode *Callee) {
308307
const auto *FoundCallee = llvm::find_if(
309308
Caller->callees(), [Callee](const CallGraphNode::CallRecord &Call) {
310309
return Call.Callee == Callee;
@@ -314,7 +313,7 @@ Expr *findCallExpr(const CallGraphNode *Caller, const CallGraphNode *Callee) {
314313
return FoundCallee->CallExpr;
315314
}
316315

317-
SourceRange getSourceRangeOfStmt(const Stmt *S, ASTContext &Ctx) {
316+
static SourceRange getSourceRangeOfStmt(const Stmt *S, ASTContext &Ctx) {
318317
ParentMapContext &PM = Ctx.getParentMapContext();
319318
DynTypedNode P = DynTypedNode::create(*S);
320319
while (P.getSourceRange().isInvalid()) {
@@ -326,9 +325,9 @@ SourceRange getSourceRangeOfStmt(const Stmt *S, ASTContext &Ctx) {
326325
return P.getSourceRange();
327326
}
328327

329-
AST_MATCHER(FunctionDecl, isStandardFunction) {
330-
return isStandardFunction(&Node);
331-
}
328+
namespace {
329+
330+
AST_MATCHER(FunctionDecl, isStandard) { return isStandardFunction(&Node); }
332331

333332
} // namespace
334333

@@ -354,7 +353,7 @@ bool SignalHandlerCheck::isLanguageVersionSupported(
354353

355354
void SignalHandlerCheck::registerMatchers(MatchFinder *Finder) {
356355
auto SignalFunction = functionDecl(hasAnyName("::signal", "::std::signal"),
357-
parameterCountIs(2), isStandardFunction());
356+
parameterCountIs(2), isStandard());
358357
auto HandlerExpr =
359358
declRefExpr(hasDeclaration(functionDecl().bind("handler_decl")),
360359
unless(isExpandedFromMacro("SIG_IGN")),

‎clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ using namespace clang::ast_matchers;
2929
using namespace clang::tidy::matchers;
3030

3131
namespace clang::tidy::misc {
32-
namespace {
3332
using llvm::APSInt;
3433

3534
static constexpr llvm::StringLiteral KnownBannedMacroNames[] = {
@@ -420,6 +419,8 @@ markDuplicateOperands(const TExpr *TheExpr,
420419
return Duplicates.any();
421420
}
422421

422+
namespace {
423+
423424
AST_MATCHER(Expr, isIntegerConstantExpr) {
424425
if (Node.isInstantiationDependent())
425426
return false;
@@ -470,6 +471,8 @@ AST_MATCHER_P(Expr, expandedByMacro, ArrayRef<llvm::StringLiteral>, Names) {
470471
return false;
471472
}
472473

474+
} // namespace
475+
473476
// Returns a matcher for integer constant expressions.
474477
static ast_matchers::internal::Matcher<Expr>
475478
matchIntegerConstantExpr(StringRef Id) {
@@ -921,7 +924,6 @@ static bool areExprsSameMacroOrLiteral(const BinaryOperator *BinOp,
921924

922925
return false;
923926
}
924-
} // namespace
925927

926928
void RedundantExpressionCheck::registerMatchers(MatchFinder *Finder) {
927929
const auto BannedIntegerLiteral =

‎clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@ void UniqueptrResetReleaseCheck::registerMatchers(MatchFinder *Finder) {
5353
this);
5454
}
5555

56-
namespace {
57-
const Type *getDeleterForUniquePtr(const MatchFinder::MatchResult &Result,
58-
StringRef ID) {
56+
static const Type *
57+
getDeleterForUniquePtr(const MatchFinder::MatchResult &Result, StringRef ID) {
5958
const auto *Class =
6059
Result.Nodes.getNodeAs<ClassTemplateSpecializationDecl>(ID);
6160
if (!Class)
@@ -66,7 +65,7 @@ const Type *getDeleterForUniquePtr(const MatchFinder::MatchResult &Result,
6665
return DeleterArgument.getAsType().getTypePtr();
6766
}
6867

69-
bool areDeletersCompatible(const MatchFinder::MatchResult &Result) {
68+
static bool areDeletersCompatible(const MatchFinder::MatchResult &Result) {
7069
const Type *LeftDeleterType = getDeleterForUniquePtr(Result, "left_class");
7170
const Type *RightDeleterType = getDeleterForUniquePtr(Result, "right_class");
7271

@@ -103,8 +102,6 @@ bool areDeletersCompatible(const MatchFinder::MatchResult &Result) {
103102
return false;
104103
}
105104

106-
} // namespace
107-
108105
void UniqueptrResetReleaseCheck::check(const MatchFinder::MatchResult &Result) {
109106
if (!areDeletersCompatible(Result))
110107
return;

‎clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ AST_MATCHER(Type, sugaredNullptrType) {
3030
return false;
3131
}
3232

33+
} // namespace
34+
3335
/// Create a matcher that finds implicit casts as well as the head of a
3436
/// sequence of zero or more nested explicit casts that have an implicit cast
3537
/// to null within.
@@ -43,7 +45,8 @@ AST_MATCHER(Type, sugaredNullptrType) {
4345
/// would check for the "NULL" macro instead, but that'd be harder to express.
4446
/// In practice, "NULL" is often defined as "__null", and this is a useful
4547
/// condition.
46-
StatementMatcher makeCastSequenceMatcher(llvm::ArrayRef<StringRef> NameList) {
48+
static StatementMatcher
49+
makeCastSequenceMatcher(llvm::ArrayRef<StringRef> NameList) {
4750
auto ImplicitCastToNull = implicitCastExpr(
4851
anyOf(hasCastKind(CK_NullToPointer), hasCastKind(CK_NullToMemberPointer)),
4952
anyOf(hasSourceExpression(gnuNullExpr()),
@@ -79,16 +82,16 @@ StatementMatcher makeCastSequenceMatcher(llvm::ArrayRef<StringRef> NameList) {
7982
unless(hasAncestor(functionDecl(isDefaulted()))))));
8083
}
8184

82-
bool isReplaceableRange(SourceLocation StartLoc, SourceLocation EndLoc,
83-
const SourceManager &SM) {
85+
static bool isReplaceableRange(SourceLocation StartLoc, SourceLocation EndLoc,
86+
const SourceManager &SM) {
8487
return SM.isWrittenInSameFile(StartLoc, EndLoc);
8588
}
8689

8790
/// Replaces the provided range with the text "nullptr", but only if
8891
/// the start and end location are both in main file.
8992
/// Returns true if and only if a replacement was made.
90-
void replaceWithNullptr(ClangTidyCheck &Check, SourceManager &SM,
91-
SourceLocation StartLoc, SourceLocation EndLoc) {
93+
static void replaceWithNullptr(ClangTidyCheck &Check, SourceManager &SM,
94+
SourceLocation StartLoc, SourceLocation EndLoc) {
9295
CharSourceRange Range(SourceRange(StartLoc, EndLoc), true);
9396
// Add a space if nullptr follows an alphanumeric character. This happens
9497
// whenever there is an c-style explicit cast to nullptr not surrounded by
@@ -106,8 +109,9 @@ void replaceWithNullptr(ClangTidyCheck &Check, SourceManager &SM,
106109
/// #define MY_NULL NULL
107110
/// \endcode
108111
/// If \p Loc points to NULL, this function will return the name MY_NULL.
109-
StringRef getOutermostMacroName(SourceLocation Loc, const SourceManager &SM,
110-
const LangOptions &LO) {
112+
static StringRef getOutermostMacroName(SourceLocation Loc,
113+
const SourceManager &SM,
114+
const LangOptions &LO) {
111115
assert(Loc.isMacroID());
112116
SourceLocation OutermostMacroLoc;
113117

@@ -119,6 +123,8 @@ StringRef getOutermostMacroName(SourceLocation Loc, const SourceManager &SM,
119123
return Lexer::getImmediateMacroName(OutermostMacroLoc, SM, LO);
120124
}
121125

126+
namespace {
127+
122128
/// RecursiveASTVisitor for ensuring all nodes rooted at a given AST
123129
/// subtree that have file-level source locations corresponding to a macro
124130
/// argument have implicit NullTo(Member)Pointer nodes as ancestors.

‎clang-tools-extra/clang-tidy/performance/FasterStringFindCheck.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ using namespace clang::ast_matchers;
1717

1818
namespace clang::tidy::performance {
1919

20-
namespace {
21-
22-
std::optional<std::string> makeCharacterLiteral(const StringLiteral *Literal) {
20+
static std::optional<std::string>
21+
makeCharacterLiteral(const StringLiteral *Literal) {
2322
std::string Result;
2423
{
2524
llvm::raw_string_ostream OS(Result);
@@ -43,6 +42,8 @@ std::optional<std::string> makeCharacterLiteral(const StringLiteral *Literal) {
4342
return Result;
4443
}
4544

45+
namespace {
46+
4647
AST_MATCHER_FUNCTION(ast_matchers::internal::Matcher<Expr>,
4748
hasSubstitutedType) {
4849
return hasType(qualType(anyOf(substTemplateTypeParmType(),

‎clang-tools-extra/clang-tidy/performance/InefficientVectorOperationCheck.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ using namespace clang::ast_matchers;
1717

1818
namespace clang::tidy::performance {
1919

20-
namespace {
21-
2220
// Matcher names. Given the code:
2321
//
2422
// \code
@@ -60,12 +58,14 @@ static const char LoopInitVarName[] = "loop_init_var";
6058
static const char LoopEndExprName[] = "loop_end_expr";
6159
static const char RangeLoopName[] = "for_range_loop";
6260

63-
ast_matchers::internal::Matcher<Expr> supportedContainerTypesMatcher() {
61+
static ast_matchers::internal::Matcher<Expr> supportedContainerTypesMatcher() {
6462
return hasType(cxxRecordDecl(hasAnyName(
6563
"::std::vector", "::std::set", "::std::unordered_set", "::std::map",
6664
"::std::unordered_map", "::std::array", "::std::deque")));
6765
}
6866

67+
namespace {
68+
6969
AST_MATCHER(Expr, hasSideEffects) {
7070
return Node.HasSideEffects(Finder->getASTContext());
7171
}

‎clang-tools-extra/clang-tidy/readability/DuplicateIncludeCheck.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ class DuplicateIncludeCallbacks : public PPCallbacks {
6464
const SourceManager &SM;
6565
};
6666

67+
} // namespace
68+
6769
void DuplicateIncludeCallbacks::FileChanged(SourceLocation Loc,
6870
FileChangeReason Reason,
6971
SrcMgr::CharacteristicKind FileType,
@@ -107,8 +109,6 @@ void DuplicateIncludeCallbacks::MacroUndefined(const Token &MacroNameTok,
107109
Files.back().clear();
108110
}
109111

110-
} // namespace
111-
112112
void DuplicateIncludeCheck::registerPPCallbacks(
113113
const SourceManager &SM, Preprocessor *PP, Preprocessor *ModuleExpanderPP) {
114114
PP->addPPCallbacks(std::make_unique<DuplicateIncludeCallbacks>(*this, SM));

‎clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.cpp‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,12 @@ struct InconsistentDeclarationInfo {
5454
using InconsistentDeclarationsContainer =
5555
llvm::SmallVector<InconsistentDeclarationInfo, 2>;
5656

57-
bool checkIfFixItHintIsApplicable(
58-
const FunctionDecl *ParameterSourceDeclaration,
59-
const ParmVarDecl *SourceParam, const FunctionDecl *OriginalDeclaration) {
57+
} // namespace
58+
59+
static bool
60+
checkIfFixItHintIsApplicable(const FunctionDecl *ParameterSourceDeclaration,
61+
const ParmVarDecl *SourceParam,
62+
const FunctionDecl *OriginalDeclaration) {
6063
// Assumptions with regard to function declarations/definition:
6164
// * If both function declaration and definition are seen, assume that
6265
// definition is most up-to-date, and use it to generate replacements.
@@ -83,7 +86,7 @@ bool checkIfFixItHintIsApplicable(
8386
return true;
8487
}
8588

86-
bool nameMatch(StringRef L, StringRef R, bool Strict) {
89+
static bool nameMatch(StringRef L, StringRef R, bool Strict) {
8790
if (Strict)
8891
return L.empty() || R.empty() || L == R;
8992
// We allow two names if one is a prefix/suffix of the other, ignoring case.
@@ -92,7 +95,7 @@ bool nameMatch(StringRef L, StringRef R, bool Strict) {
9295
L.ends_with_insensitive(R) || R.ends_with_insensitive(L);
9396
}
9497

95-
DifferingParamsContainer
98+
static DifferingParamsContainer
9699
findDifferingParamsInDeclaration(const FunctionDecl *ParameterSourceDeclaration,
97100
const FunctionDecl *OtherDeclaration,
98101
const FunctionDecl *OriginalDeclaration,
@@ -129,7 +132,7 @@ findDifferingParamsInDeclaration(const FunctionDecl *ParameterSourceDeclaration,
129132
return DifferingParams;
130133
}
131134

132-
InconsistentDeclarationsContainer
135+
static InconsistentDeclarationsContainer
133136
findInconsistentDeclarations(const FunctionDecl *OriginalDeclaration,
134137
const FunctionDecl *ParameterSourceDeclaration,
135138
SourceManager &SM, bool Strict) {
@@ -162,7 +165,7 @@ findInconsistentDeclarations(const FunctionDecl *OriginalDeclaration,
162165
return InconsistentDeclarations;
163166
}
164167

165-
const FunctionDecl *
168+
static const FunctionDecl *
166169
getParameterSourceDeclaration(const FunctionDecl *OriginalDeclaration) {
167170
const FunctionTemplateDecl *PrimaryTemplate =
168171
OriginalDeclaration->getPrimaryTemplate();
@@ -187,7 +190,7 @@ getParameterSourceDeclaration(const FunctionDecl *OriginalDeclaration) {
187190
return OriginalDeclaration;
188191
}
189192

190-
std::string joinParameterNames(
193+
static std::string joinParameterNames(
191194
const DifferingParamsContainer &DifferingParams,
192195
llvm::function_ref<StringRef(const DifferingParamInfo &)> ChooseParamName) {
193196
llvm::SmallString<40> Str;
@@ -202,7 +205,7 @@ std::string joinParameterNames(
202205
return std::string(Str);
203206
}
204207

205-
void formatDifferingParamsDiagnostic(
208+
static void formatDifferingParamsDiagnostic(
206209
InconsistentDeclarationParameterNameCheck *Check, SourceLocation Location,
207210
StringRef OtherDeclarationDescription,
208211
const DifferingParamsContainer &DifferingParams) {
@@ -230,7 +233,7 @@ void formatDifferingParamsDiagnostic(
230233
}
231234
}
232235

233-
void formatDiagnosticsForDeclarations(
236+
static void formatDiagnosticsForDeclarations(
234237
InconsistentDeclarationParameterNameCheck *Check,
235238
const FunctionDecl *ParameterSourceDeclaration,
236239
const FunctionDecl *OriginalDeclaration,
@@ -256,7 +259,7 @@ void formatDiagnosticsForDeclarations(
256259
}
257260
}
258261

259-
void formatDiagnostics(
262+
static void formatDiagnostics(
260263
InconsistentDeclarationParameterNameCheck *Check,
261264
const FunctionDecl *ParameterSourceDeclaration,
262265
const FunctionDecl *OriginalDeclaration,
@@ -279,8 +282,6 @@ void formatDiagnostics(
279282
}
280283
}
281284

282-
} // anonymous namespace
283-
284285
void InconsistentDeclarationParameterNameCheck::storeOptions(
285286
ClangTidyOptions::OptionMap &Opts) {
286287
Options.store(Opts, "IgnoreMacros", IgnoreMacros);

0 commit comments

Comments
 (0)