[clang-tools-extra] f1f1633 - [clang-tidy][NFC] Fix readability-inconsistent-declaration-parameter-name findings
Piotr Zegar via cfe-commits
cfe-commits at lists.llvm.org
Sun Aug 27 01:53:28 PDT 2023
Author: Piotr Zegar
Date: 2023-08-27T08:52:09Z
New Revision: f1f16331bd6810a574100a31d369921c1f4adcaf
URL: https://github.com/llvm/llvm-project/commit/f1f16331bd6810a574100a31d369921c1f4adcaf
DIFF: https://github.com/llvm/llvm-project/commit/f1f16331bd6810a574100a31d369921c1f4adcaf.diff
LOG: [clang-tidy][NFC] Fix readability-inconsistent-declaration-parameter-name findings
Fix issues found by clang-tidy in clang-tidy source directory.
Added:
Modified:
clang-tools-extra/clang-tidy/ClangTidyCheck.cpp
clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h
clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.h
clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp
clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h
clang-tools-extra/clang-tidy/google/IntegerTypesCheck.h
clang-tools-extra/clang-tidy/hicpp/SignedBitwiseCheck.h
clang-tools-extra/clang-tidy/modernize/ConcatNestedNamespacesCheck.h
clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp
clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.h
clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.h
clang-tools-extra/clang-tidy/modernize/RawStringLiteralCheck.h
clang-tools-extra/clang-tidy/objc/ForbiddenSubclassingCheck.h
clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
clang-tools-extra/clang-tidy/readability/ImplicitBoolConversionCheck.h
clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h
clang-tools-extra/clang-tidy/readability/NamespaceCommentCheck.h
clang-tools-extra/clang-tidy/readability/SimplifyBooleanExprCheck.h
clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h
clang-tools-extra/clang-tidy/utils/ExceptionSpecAnalyzer.h
clang-tools-extra/clang-tidy/utils/FixItHintUtils.h
Removed:
################################################################################
diff --git a/clang-tools-extra/clang-tidy/ClangTidyCheck.cpp b/clang-tools-extra/clang-tidy/ClangTidyCheck.cpp
index 18169deaa0681e..9573cc3b7d6b3c 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyCheck.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidyCheck.cpp
@@ -22,14 +22,15 @@ ClangTidyCheck::ClangTidyCheck(StringRef CheckName, ClangTidyContext *Context)
assert(!CheckName.empty());
}
-DiagnosticBuilder ClangTidyCheck::diag(SourceLocation Loc, StringRef Message,
+DiagnosticBuilder ClangTidyCheck::diag(SourceLocation Loc,
+ StringRef Description,
DiagnosticIDs::Level Level) {
- return Context->diag(CheckName, Loc, Message, Level);
+ return Context->diag(CheckName, Loc, Description, Level);
}
-DiagnosticBuilder ClangTidyCheck::diag(StringRef Message,
+DiagnosticBuilder ClangTidyCheck::diag(StringRef Description,
DiagnosticIDs::Level Level) {
- return Context->diag(CheckName, Message, Level);
+ return Context->diag(CheckName, Description, Level);
}
DiagnosticBuilder
diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
index 41a210a83a84f3..fc88a186484365 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.cpp
@@ -342,10 +342,10 @@ void ClangTidyDiagnosticConsumer::finalizeLastError() {
namespace clang::tidy {
const llvm::StringMap<tooling::Replacements> *
-getFixIt(const tooling::Diagnostic &Diagnostic, bool GetFixFromNotes) {
+getFixIt(const tooling::Diagnostic &Diagnostic, bool AnyFix) {
if (!Diagnostic.Message.Fix.empty())
return &Diagnostic.Message.Fix;
- if (!GetFixFromNotes)
+ if (!AnyFix)
return nullptr;
const llvm::StringMap<tooling::Replacements> *Result = nullptr;
for (const auto &Note : Diagnostic.Notes) {
diff --git a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h
index d3e15e7b2915ea..962f7dc32de3e6 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h
+++ b/clang-tools-extra/clang-tidy/ClangTidyDiagnosticConsumer.h
@@ -87,10 +87,10 @@ class ClangTidyContext {
/// tablegen'd diagnostic IDs.
/// FIXME: Figure out a way to manage ID spaces.
DiagnosticBuilder diag(StringRef CheckName, SourceLocation Loc,
- StringRef Message,
+ StringRef Description,
DiagnosticIDs::Level Level = DiagnosticIDs::Warning);
- DiagnosticBuilder diag(StringRef CheckName, StringRef Message,
+ DiagnosticBuilder diag(StringRef CheckName, StringRef Description,
DiagnosticIDs::Level Level = DiagnosticIDs::Warning);
DiagnosticBuilder diag(const tooling::Diagnostic &Error);
diff --git a/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp b/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
index f800e560331016..f532d3ea7a941c 100644
--- a/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
+++ b/clang-tools-extra/clang-tidy/ClangTidyOptions.cpp
@@ -83,13 +83,13 @@ struct NOptionMap {
};
template <>
-void yamlize(IO &IO, ClangTidyOptions::OptionMap &Options, bool,
+void yamlize(IO &IO, ClangTidyOptions::OptionMap &Val, bool,
EmptyContext &Ctx) {
if (IO.outputting()) {
// Ensure check options are sorted
std::vector<std::pair<StringRef, StringRef>> SortedOptions;
- SortedOptions.reserve(Options.size());
- for (auto &Key : Options) {
+ SortedOptions.reserve(Val.size());
+ for (auto &Key : Val) {
SortedOptions.emplace_back(Key.getKey(), Key.getValue().Value);
}
std::sort(SortedOptions.begin(), SortedOptions.end());
@@ -109,14 +109,14 @@ void yamlize(IO &IO, ClangTidyOptions::OptionMap &Options, bool,
// options using a list of maps containing key and value keys.
Input &I = reinterpret_cast<Input &>(IO);
if (isa<SequenceNode>(I.getCurrentNode())) {
- MappingNormalization<NOptionMap, ClangTidyOptions::OptionMap> NOpts(
- IO, Options);
+ MappingNormalization<NOptionMap, ClangTidyOptions::OptionMap> NOpts(IO,
+ Val);
EmptyContext Ctx;
yamlize(IO, NOpts->Options, true, Ctx);
} else if (isa<MappingNode>(I.getCurrentNode())) {
IO.beginMapping();
for (StringRef Key : IO.keys()) {
- IO.mapRequired(Key.data(), Options[Key].Value);
+ IO.mapRequired(Key.data(), Val[Key].Value);
}
IO.endMapping();
} else {
@@ -130,18 +130,17 @@ struct ChecksVariant {
std::optional<std::vector<std::string>> AsVector;
};
-template <>
-void yamlize(IO &IO, ChecksVariant &Checks, bool, EmptyContext &Ctx) {
+template <> void yamlize(IO &IO, ChecksVariant &Val, bool, EmptyContext &Ctx) {
if (!IO.outputting()) {
// Special case for reading from YAML
// Must support reading from both a string or a list
Input &I = reinterpret_cast<Input &>(IO);
if (isa<ScalarNode, BlockScalarNode>(I.getCurrentNode())) {
- Checks.AsString = std::string();
- yamlize(IO, *Checks.AsString, true, Ctx);
+ Val.AsString = std::string();
+ yamlize(IO, *Val.AsString, true, Ctx);
} else if (isa<SequenceNode>(I.getCurrentNode())) {
- Checks.AsVector = std::vector<std::string>();
- yamlize(IO, *Checks.AsVector, true, Ctx);
+ Val.AsVector = std::vector<std::string>();
+ yamlize(IO, *Val.AsVector, true, Ctx);
} else {
IO.setError("expected string or sequence");
}
diff --git a/clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.h b/clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.h
index 91c3a62d2139de..3f6abc315e5b90 100644
--- a/clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.h
+++ b/clang-tools-extra/clang-tidy/ExpandModularHeadersPPCallbacks.h
@@ -41,7 +41,7 @@ namespace tooling {
class ExpandModularHeadersPPCallbacks : public PPCallbacks {
public:
ExpandModularHeadersPPCallbacks(
- CompilerInstance *Compiler,
+ CompilerInstance *CI,
IntrusiveRefCntPtr<llvm::vfs::OverlayFileSystem> OverlayFS);
~ExpandModularHeadersPPCallbacks();
diff --git a/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp b/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp
index f88b70b8d02aa0..434af463830ba3 100644
--- a/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/altera/KernelNameRestrictionCheck.cpp
@@ -35,9 +35,9 @@ class KernelNameRestrictionPPCallbacks : public PPCallbacks {
void EndOfMainFile() override;
private:
- /// Returns true if the name of the file with path FilePath is 'kernel.cl',
+ /// Returns true if the name of the file with path FileName is 'kernel.cl',
/// 'verilog.cl', or 'vhdl.cl'. The file name check is case insensitive.
- bool fileNameIsRestricted(StringRef FilePath);
+ bool fileNameIsRestricted(StringRef FileName);
struct IncludeDirective {
SourceLocation Loc; // Location in the include directive.
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h b/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h
index 8a5e7b14f3e7c6..c14219b85e9083 100644
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/SpecialMemberFunctionsCheck.h
@@ -62,7 +62,7 @@ class SpecialMemberFunctionsCheck : public ClangTidyCheck {
private:
void checkForMissingMembers(
const ClassDefId &ID,
- llvm::ArrayRef<SpecialMemberFunctionData> DefinedSpecialMembers);
+ llvm::ArrayRef<SpecialMemberFunctionData> DefinedMembers);
const bool AllowMissingMoveFunctions;
const bool AllowSoleDefaultDtor;
diff --git a/clang-tools-extra/clang-tidy/google/IntegerTypesCheck.h b/clang-tools-extra/clang-tidy/google/IntegerTypesCheck.h
index e7c3f659bf385b..3be7d24021b9ff 100644
--- a/clang-tools-extra/clang-tidy/google/IntegerTypesCheck.h
+++ b/clang-tools-extra/clang-tidy/google/IntegerTypesCheck.h
@@ -34,7 +34,7 @@ class IntegerTypesCheck : public ClangTidyCheck {
}
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
- void storeOptions(ClangTidyOptions::OptionMap &Options) override;
+ void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
private:
const StringRef UnsignedTypePrefix;
diff --git a/clang-tools-extra/clang-tidy/hicpp/SignedBitwiseCheck.h b/clang-tools-extra/clang-tidy/hicpp/SignedBitwiseCheck.h
index 5a18d3295318fe..170c249bc65e66 100644
--- a/clang-tools-extra/clang-tidy/hicpp/SignedBitwiseCheck.h
+++ b/clang-tools-extra/clang-tidy/hicpp/SignedBitwiseCheck.h
@@ -23,7 +23,7 @@ class SignedBitwiseCheck : public ClangTidyCheck {
SignedBitwiseCheck(StringRef Name, ClangTidyContext *Context);
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
- void storeOptions(ClangTidyOptions::OptionMap &Options) override;
+ void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
private:
bool IgnorePositiveIntegerLiterals;
diff --git a/clang-tools-extra/clang-tidy/modernize/ConcatNestedNamespacesCheck.h b/clang-tools-extra/clang-tidy/modernize/ConcatNestedNamespacesCheck.h
index 941104e8bb1438..a5724e169e48d5 100644
--- a/clang-tools-extra/clang-tidy/modernize/ConcatNestedNamespacesCheck.h
+++ b/clang-tools-extra/clang-tidy/modernize/ConcatNestedNamespacesCheck.h
@@ -45,8 +45,7 @@ class ConcatNestedNamespacesCheck : public ClangTidyCheck {
private:
using NamespaceContextVec = llvm::SmallVector<NS, 6>;
- void reportDiagnostic(const SourceManager &Sources,
- const LangOptions &LangOpts);
+ void reportDiagnostic(const SourceManager &SM, const LangOptions &LangOpts);
NamespaceContextVec Namespaces;
};
} // namespace clang::tidy::modernize
diff --git a/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp b/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp
index 295c2446f49db0..7593615c306768 100644
--- a/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp
@@ -49,10 +49,10 @@ bool StmtAncestorASTVisitor::TraverseStmt(Stmt *Statement) {
/// Combined with StmtAncestors, this provides roughly the same information as
/// Scope, as we can map a VarDecl to its DeclStmt, then walk up the parent tree
/// using StmtAncestors.
-bool StmtAncestorASTVisitor::VisitDeclStmt(DeclStmt *Decls) {
- for (const auto *Decl : Decls->decls()) {
+bool StmtAncestorASTVisitor::VisitDeclStmt(DeclStmt *Statement) {
+ for (const auto *Decl : Statement->decls()) {
if (const auto *V = dyn_cast<VarDecl>(Decl))
- DeclParents.insert(std::make_pair(V, Decls));
+ DeclParents.insert(std::make_pair(V, Statement));
}
return true;
}
diff --git a/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.h b/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.h
index a8aa752de2df43..54f129038ba81f 100644
--- a/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.h
+++ b/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.h
@@ -197,10 +197,10 @@ class DeclFinderASTVisitor
const StmtGeneratedVarNameMap *GeneratedDecls;
bool Found;
- bool VisitForStmt(clang::ForStmt *F);
- bool VisitNamedDecl(clang::NamedDecl *D);
- bool VisitDeclRefExpr(clang::DeclRefExpr *D);
- bool VisitTypeLoc(clang::TypeLoc TL);
+ bool VisitForStmt(clang::ForStmt *);
+ bool VisitNamedDecl(clang::NamedDecl *);
+ bool VisitDeclRefExpr(clang::DeclRefExpr *);
+ bool VisitTypeLoc(clang::TypeLoc);
};
/// The information needed to describe a valid convertible usage
diff --git a/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.h b/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.h
index 1c326c6a01b5c6..02374dc06d9be5 100644
--- a/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.h
+++ b/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.h
@@ -54,7 +54,7 @@ class MakeSmartPtrCheck : public ClangTidyCheck {
const CXXConstructExpr *Construct, const QualType *Type,
const CXXNewExpr *New);
void checkReset(SourceManager &SM, ASTContext *Ctx,
- const CXXMemberCallExpr *Member, const CXXNewExpr *New);
+ const CXXMemberCallExpr *Reset, const CXXNewExpr *New);
/// Returns true when the fixes for replacing CXXNewExpr are generated.
bool replaceNew(DiagnosticBuilder &Diag, const CXXNewExpr *New,
diff --git a/clang-tools-extra/clang-tidy/modernize/RawStringLiteralCheck.h b/clang-tools-extra/clang-tidy/modernize/RawStringLiteralCheck.h
index e1a65e1ad8bd64..aae58ca0e98d9a 100644
--- a/clang-tools-extra/clang-tidy/modernize/RawStringLiteralCheck.h
+++ b/clang-tools-extra/clang-tidy/modernize/RawStringLiteralCheck.h
@@ -28,7 +28,7 @@ class RawStringLiteralCheck : public ClangTidyCheck {
bool isLanguageVersionSupported(const LangOptions &LangOpts) const override {
return LangOpts.CPlusPlus11;
}
- void storeOptions(ClangTidyOptions::OptionMap &Options) override;
+ void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
diff --git a/clang-tools-extra/clang-tidy/objc/ForbiddenSubclassingCheck.h b/clang-tools-extra/clang-tidy/objc/ForbiddenSubclassingCheck.h
index 2bb8b0b9d0dec1..3410868ed42a83 100644
--- a/clang-tools-extra/clang-tidy/objc/ForbiddenSubclassingCheck.h
+++ b/clang-tools-extra/clang-tidy/objc/ForbiddenSubclassingCheck.h
@@ -28,7 +28,7 @@ class ForbiddenSubclassingCheck : public ClangTidyCheck {
}
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
- void storeOptions(ClangTidyOptions::OptionMap &Options) override;
+ void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
private:
const std::vector<StringRef> ForbiddenSuperClassNames;
diff --git a/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp b/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
index 1dfa9dce0c52b1..6889aa9718477c 100644
--- a/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/BracesAroundStatementsCheck.cpp
@@ -187,7 +187,7 @@ BracesAroundStatementsCheck::findRParenLoc(const IfOrWhileStmt *S,
/// Returns true if braces where added.
bool BracesAroundStatementsCheck::checkStmt(
const MatchFinder::MatchResult &Result, const Stmt *S,
- SourceLocation InitialLoc, SourceLocation EndLocHint) {
+ SourceLocation StartLoc, SourceLocation EndLocHint) {
while (const auto *AS = dyn_cast<AttributedStmt>(S))
S = AS->getSubStmt();
@@ -214,20 +214,20 @@ bool BracesAroundStatementsCheck::checkStmt(
getTokenKind(StmtBeginLoc, SM, Context) == tok::l_brace)
return false;
- if (!InitialLoc.isValid())
+ if (StartLoc.isInvalid())
return false;
- // Convert InitialLoc to file location, if it's on the same macro expansion
+ // Convert StartLoc to file location, if it's on the same macro expansion
// level as the start of the statement. We also need file locations for
// Lexer::getLocForEndOfToken working properly.
- InitialLoc = Lexer::makeFileCharRange(
- CharSourceRange::getCharRange(InitialLoc, S->getBeginLoc()),
- SM, Context->getLangOpts())
- .getBegin();
- if (InitialLoc.isInvalid())
+ StartLoc = Lexer::makeFileCharRange(
+ CharSourceRange::getCharRange(StartLoc, S->getBeginLoc()), SM,
+ Context->getLangOpts())
+ .getBegin();
+ if (StartLoc.isInvalid())
return false;
- SourceLocation StartLoc =
- Lexer::getLocForEndOfToken(InitialLoc, 0, SM, Context->getLangOpts());
+ StartLoc =
+ Lexer::getLocForEndOfToken(StartLoc, 0, SM, Context->getLangOpts());
// StartLoc points at the location of the opening brace to be inserted.
SourceLocation EndLoc;
diff --git a/clang-tools-extra/clang-tidy/readability/ImplicitBoolConversionCheck.h b/clang-tools-extra/clang-tidy/readability/ImplicitBoolConversionCheck.h
index 67fd3ff5c339f4..9defec91e2f78d 100644
--- a/clang-tools-extra/clang-tidy/readability/ImplicitBoolConversionCheck.h
+++ b/clang-tools-extra/clang-tidy/readability/ImplicitBoolConversionCheck.h
@@ -30,8 +30,8 @@ class ImplicitBoolConversionCheck : public ClangTidyCheck {
private:
void handleCastToBool(const ImplicitCastExpr *CastExpression,
const Stmt *ParentStatement, ASTContext &Context);
- void handleCastFromBool(const ImplicitCastExpr *CastExpression,
- const ImplicitCastExpr *FurtherImplicitCastExpression,
+ void handleCastFromBool(const ImplicitCastExpr *Cast,
+ const ImplicitCastExpr *NextImplicitCast,
ASTContext &Context);
const bool AllowIntegerConditions;
diff --git a/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h b/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h
index 11fee1e720bdab..1c526577b403f6 100644
--- a/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h
+++ b/clang-tools-extra/clang-tidy/readability/InconsistentDeclarationParameterNameCheck.h
@@ -36,7 +36,7 @@ class InconsistentDeclarationParameterNameCheck : public ClangTidyCheck {
}
private:
- void markRedeclarationsAsVisited(const FunctionDecl *FunctionDeclaration);
+ void markRedeclarationsAsVisited(const FunctionDecl *OriginalDeclaration);
llvm::DenseSet<const FunctionDecl *> VisitedDeclarations;
const bool IgnoreMacros;
diff --git a/clang-tools-extra/clang-tidy/readability/NamespaceCommentCheck.h b/clang-tools-extra/clang-tidy/readability/NamespaceCommentCheck.h
index fc73d3e06fc045..7607d37b1b2fd8 100644
--- a/clang-tools-extra/clang-tidy/readability/NamespaceCommentCheck.h
+++ b/clang-tools-extra/clang-tidy/readability/NamespaceCommentCheck.h
@@ -29,7 +29,7 @@ class NamespaceCommentCheck : public ClangTidyCheck {
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
private:
- void storeOptions(ClangTidyOptions::OptionMap &Options) override;
+ void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
llvm::Regex NamespaceCommentPattern;
const unsigned ShortNamespaceLines;
diff --git a/clang-tools-extra/clang-tidy/readability/SimplifyBooleanExprCheck.h b/clang-tools-extra/clang-tidy/readability/SimplifyBooleanExprCheck.h
index f9ed331b7bc064..c4dad24ec39985 100644
--- a/clang-tools-extra/clang-tidy/readability/SimplifyBooleanExprCheck.h
+++ b/clang-tools-extra/clang-tidy/readability/SimplifyBooleanExprCheck.h
@@ -22,7 +22,7 @@ class SimplifyBooleanExprCheck : public ClangTidyCheck {
public:
SimplifyBooleanExprCheck(StringRef Name, ClangTidyContext *Context);
- void storeOptions(ClangTidyOptions::OptionMap &Options) override;
+ void storeOptions(ClangTidyOptions::OptionMap &Opts) override;
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
std::optional<TraversalKind> getCheckTraversalKind() const override {
@@ -60,7 +60,7 @@ class SimplifyBooleanExprCheck : public ClangTidyCheck {
const BinaryOperator *Inner, bool TryOfferFix,
const Stmt *Parent, const ParenExpr *Parens);
- void issueDiag(const ASTContext &Result, SourceLocation Loc,
+ void issueDiag(const ASTContext &Context, SourceLocation Loc,
StringRef Description, SourceRange ReplacementRange,
StringRef Replacement);
diff --git a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h
index a1cb111aa3fbff..af4db6bc7bd464 100644
--- a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h
+++ b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.h
@@ -78,7 +78,7 @@ class ExceptionAnalyzer {
/// possible to catch multiple exception types by one 'catch' if they
/// are a subclass of the 'catch'ed exception type.
/// Returns 'true' if some exceptions were filtered, otherwise 'false'.
- bool filterByCatch(const Type *BaseClass, const ASTContext &Context);
+ bool filterByCatch(const Type *HandlerTy, const ASTContext &Context);
/// Filter the set of thrown exception type against a set of ignored
/// types that shall not be considered in the exception analysis.
diff --git a/clang-tools-extra/clang-tidy/utils/ExceptionSpecAnalyzer.h b/clang-tools-extra/clang-tidy/utils/ExceptionSpecAnalyzer.h
index 9c9782f7a38c6e..cf876599469387 100644
--- a/clang-tools-extra/clang-tidy/utils/ExceptionSpecAnalyzer.h
+++ b/clang-tools-extra/clang-tidy/utils/ExceptionSpecAnalyzer.h
@@ -62,7 +62,8 @@ class ExceptionSpecAnalyzer {
No = false,
};
- State analyzeRecord(const CXXRecordDecl *RecDecl, DefaultableMemberKind Kind,
+ State analyzeRecord(const CXXRecordDecl *RecordDecl,
+ DefaultableMemberKind Kind,
SkipMethods SkipMethods = SkipMethods::No);
static State analyzeFunctionEST(const FunctionDecl *FuncDecl,
diff --git a/clang-tools-extra/clang-tidy/utils/FixItHintUtils.h b/clang-tools-extra/clang-tidy/utils/FixItHintUtils.h
index bb5410f84cd6d7..15894c4bf5cf8f 100644
--- a/clang-tools-extra/clang-tidy/utils/FixItHintUtils.h
+++ b/clang-tools-extra/clang-tidy/utils/FixItHintUtils.h
@@ -42,8 +42,8 @@ enum class QualifierTarget {
std::optional<FixItHint>
addQualifierToVarDecl(const VarDecl &Var, const ASTContext &Context,
DeclSpec::TQ Qualifier,
- QualifierTarget CT = QualifierTarget::Pointee,
- QualifierPolicy CP = QualifierPolicy::Left);
+ QualifierTarget QualTarget = QualifierTarget::Pointee,
+ QualifierPolicy QualPolicy = QualifierPolicy::Left);
// \brief Format a pointer to an expression
std::string formatDereference(const Expr &ExprNode, const ASTContext &Context);
More information about the cfe-commits
mailing list