[clang-tools-extra] [clang-tidy][NFC] Fix readability-inconsistent-ifelse-braces warnings (PR #182764)
via cfe-commits
cfe-commits at lists.llvm.org
Sun Feb 22 11:24:50 PST 2026
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-clang-tools-extra
Author: Baranov Victor (vbvictor)
<details>
<summary>Changes</summary>
---
Patch is 25.41 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/182764.diff
26 Files Affected:
- (modified) clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp (+4-3)
- (modified) clang-tools-extra/clang-tidy/bugprone/ImplicitWideningOfMultiplicationResultCheck.cpp (+4-3)
- (modified) clang-tools-extra/clang-tidy/bugprone/IncDecInConditionsCheck.cpp (+2-1)
- (modified) clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp (+3-2)
- (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp (+4-4)
- (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp (+2-1)
- (modified) clang-tools-extra/clang-tidy/misc/MisleadingBidirectionalCheck.cpp (+6-5)
- (modified) clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp (+4-2)
- (modified) clang-tools-extra/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp (+3-3)
- (modified) clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp (+5-3)
- (modified) clang-tools-extra/clang-tidy/modernize/AvoidCArraysCheck.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/modernize/AvoidCStyleCastCheck.cpp (+2-1)
- (modified) clang-tools-extra/clang-tidy/modernize/DeprecatedIosBaseAliasesCheck.cpp (+2-1)
- (modified) clang-tools-extra/clang-tidy/modernize/IntegralLiteralExpressionMatcher.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/readability/ContainerSizeEmptyCheck.cpp (+3-2)
- (modified) clang-tools-extra/clang-tidy/readability/DuplicateIncludeCheck.cpp (+2-1)
- (modified) clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.cpp (+2-1)
- (modified) clang-tools-extra/clang-tidy/readability/QualifiedAutoCheck.cpp (+2-1)
- (modified) clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp (+2-1)
- (modified) clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp (+2-2)
- (modified) clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp (+4-2)
- (modified) clang-tools-extra/clang-tidy/utils/FormatStringConverter.cpp (+16-14)
- (modified) clang-tools-extra/clang-tidy/utils/LexerUtils.cpp (+3-3)
- (modified) clang-tools-extra/clang-tidy/utils/RenamerClangTidyCheck.cpp (+2-1)
``````````diff
diff --git a/clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp b/clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp
index 612da6f1efeb3..0d9a59bc725cb 100644
--- a/clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp
+++ b/clang-tools-extra/clang-tidy/NoLintDirectiveHandler.cpp
@@ -213,18 +213,19 @@ formNoLintBlocks(SmallVector<NoLintToken> NoLints, const SourceManager &SrcMgr,
// inner-most block first, then the next level up, and so on. This is
// essentially a last-in-first-out/stack system.
for (NoLintToken &NoLint : NoLints) {
- if (NoLint.Type == NoLintType::NoLintBegin)
+ if (NoLint.Type == NoLintType::NoLintBegin) {
// A new block is being started. Add it to the stack.
Stack.emplace_back(std::move(NoLint));
- else if (NoLint.Type == NoLintType::NoLintEnd) {
+ } else if (NoLint.Type == NoLintType::NoLintEnd) {
if (!Stack.empty() && Stack.back().checks() == NoLint.checks()) {
// The previous block is being closed. Pop one element off the stack.
CompletedBlocks.emplace_back(Stack.back().Pos, NoLint.Pos,
std::move(Stack.back().ChecksGlob));
Stack.pop_back();
- } else
+ } else {
// Trying to close the wrong block.
NoLintErrors.emplace_back(makeNoLintError(SrcMgr, File, NoLint));
+ }
}
}
diff --git a/clang-tools-extra/clang-tidy/bugprone/ImplicitWideningOfMultiplicationResultCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/ImplicitWideningOfMultiplicationResultCheck.cpp
index 634d54c2b9bd3..7c259a6199832 100644
--- a/clang-tools-extra/clang-tidy/bugprone/ImplicitWideningOfMultiplicationResultCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/ImplicitWideningOfMultiplicationResultCheck.cpp
@@ -131,9 +131,9 @@ void ImplicitWideningOfMultiplicationResultCheck::handleImplicitCastExpr(
QualType WideExprTy;
// Get Ty of the same signedness as ExprTy, because we only want to suggest
// to widen the computation, but not change it's signedness domain.
- if (Ty->isSignedIntegerType() == ETy->isSignedIntegerType())
+ if (Ty->isSignedIntegerType() == ETy->isSignedIntegerType()) {
WideExprTy = Ty;
- else if (Ty->isSignedIntegerType()) {
+ } else if (Ty->isSignedIntegerType()) {
assert(ETy->isUnsignedIntegerType() &&
"Expected source type to be signed.");
WideExprTy = Context->getCorrespondingUnsignedType(Ty);
@@ -179,8 +179,9 @@ void ImplicitWideningOfMultiplicationResultCheck::handlePointerOffsetting(
} else if (const auto *ASE = dyn_cast<ArraySubscriptExpr>(E)) {
PointerExpr = ASE->getLHS();
IndexExpr = ASE->getRHS();
- } else
+ } else {
return;
+ }
if (IndexExpr->getType()->isPointerType())
std::swap(PointerExpr, IndexExpr);
diff --git a/clang-tools-extra/clang-tidy/bugprone/IncDecInConditionsCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/IncDecInConditionsCheck.cpp
index 553c45c2a9541..52af733dd30d5 100644
--- a/clang-tools-extra/clang-tidy/bugprone/IncDecInConditionsCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/IncDecInConditionsCheck.cpp
@@ -75,8 +75,9 @@ void IncDecInConditionsCheck::check(const MatchFinder::MatchResult &Result) {
Result.Nodes.getNodeAs<UnaryOperator>("operator")) {
ExprLoc = MatchedDecl->getExprLoc();
IsIncrementOp = MatchedDecl->isIncrementOp();
- } else
+ } else {
return;
+ }
diag(ExprLoc,
"%select{decrementing|incrementing}0 and referencing a variable in a "
diff --git a/clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp
index 4ad85a7bf55fb..072e80e20b0c5 100644
--- a/clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/InfiniteLoopCheck.cpp
@@ -164,10 +164,11 @@ static bool isKnownToHaveValue(const Expr &Cond, const ASTContext &Ctx,
} else if (const auto *UnOp = dyn_cast<UnaryOperator>(&Cond)) {
if (UnOp->getOpcode() == UO_LNot)
return isKnownToHaveValue(*UnOp->getSubExpr(), Ctx, !ExpectedValue);
- } else if (const auto *Paren = dyn_cast<ParenExpr>(&Cond))
+ } else if (const auto *Paren = dyn_cast<ParenExpr>(&Cond)) {
return isKnownToHaveValue(*Paren->getSubExpr(), Ctx, ExpectedValue);
- else if (const auto *ImplCast = dyn_cast<ImplicitCastExpr>(&Cond))
+ } else if (const auto *ImplCast = dyn_cast<ImplicitCastExpr>(&Cond)) {
return isKnownToHaveValue(*ImplCast->getSubExpr(), Ctx, ExpectedValue);
+ }
return false;
}
bool Result = false;
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp
index 770d1c8e55fef..402ee9efcbc04 100644
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/InitVariablesCheck.cpp
@@ -86,13 +86,13 @@ void InitVariablesCheck::check(const MatchFinder::MatchResult &Result) {
std::optional<const char *> InitializationString;
bool AddMathInclude = false;
- if (TypePtr->isEnumeralType())
+ if (TypePtr->isEnumeralType()) {
InitializationString = nullptr;
- else if (TypePtr->isBooleanType())
+ } else if (TypePtr->isBooleanType()) {
InitializationString = " = false";
- else if (TypePtr->isIntegerType())
+ } else if (TypePtr->isIntegerType()) {
InitializationString = " = 0";
- else if (TypePtr->isFloatingType()) {
+ } else if (TypePtr->isFloatingType()) {
InitializationString = " = NAN";
AddMathInclude = true;
} else if (TypePtr->isAnyPointerType() || TypePtr->isMemberPointerType()) {
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp
index ab34eb805aad9..164943293c8d2 100644
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/PreferMemberInitializerCheck.cpp
@@ -217,9 +217,9 @@ void PreferMemberInitializerCheck::check(
continue;
if (Init->getMember() == Field) {
HasInitAlready = true;
- if (isa<ImplicitValueInitExpr>(Init->getInit()))
+ if (isa<ImplicitValueInitExpr>(Init->getInit())) {
InsertPos = Init->getRParenLoc();
- else {
+ } else {
ReplaceRange = Init->getInit()->getSourceRange();
AddBrace = isa<InitListExpr>(Init->getInit());
}
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp
index 54b8a72c865af..a259d03724d24 100644
--- a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp
+++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProTypeMemberInitCheck.cpp
@@ -71,8 +71,9 @@ removeFieldInitialized(const FieldDecl *M,
// Erase all members in a union if any member of it is initialized.
for (const auto *F : R->fields())
FieldDecls.erase(F);
- } else
+ } else {
FieldDecls.erase(M);
+ }
}
static void
diff --git a/clang-tools-extra/clang-tidy/misc/MisleadingBidirectionalCheck.cpp b/clang-tools-extra/clang-tidy/misc/MisleadingBidirectionalCheck.cpp
index 8a10f70c12f93..9294c2b57e15e 100644
--- a/clang-tools-extra/clang-tidy/misc/MisleadingBidirectionalCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/MisleadingBidirectionalCheck.cpp
@@ -64,25 +64,26 @@ static bool containsMisleadingBidi(StringRef Buffer,
// Open a PDF context.
if (CodePoint == RLO || CodePoint == RLE || CodePoint == LRO ||
- CodePoint == LRE)
+ CodePoint == LRE) {
BidiContexts.push_back(PDF);
// Close PDF Context.
- else if (CodePoint == PDF) {
+ } else if (CodePoint == PDF) {
if (!BidiContexts.empty() && BidiContexts.back() == PDF)
BidiContexts.pop_back();
}
// Open a PDI Context.
- else if (CodePoint == RLI || CodePoint == LRI || CodePoint == FSI)
+ else if (CodePoint == RLI || CodePoint == LRI || CodePoint == FSI) {
BidiContexts.push_back(PDI);
// Close a PDI Context.
- else if (CodePoint == PDI) {
+ } else if (CodePoint == PDI) {
auto R = llvm::find(llvm::reverse(BidiContexts), PDI);
if (R != BidiContexts.rend())
BidiContexts.resize(BidiContexts.rend() - R - 1);
}
// Line break or equivalent
- else if (CodePoint == PS)
+ else if (CodePoint == PS) {
BidiContexts.clear();
+ }
}
return !BidiContexts.empty();
}
diff --git a/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp b/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp
index 63be9dd47dca7..945da332130a3 100644
--- a/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/RedundantExpressionCheck.cpp
@@ -679,11 +679,13 @@ static bool retrieveRelationalIntegerConstantExpr(
if (!Arg->isValueDependent() &&
!Arg->isIntegerConstantExpr(*Result.Context))
return false;
- } else
+ } else {
return false;
+ }
}
- } else
+ } else {
return false;
+ }
Symbol = OverloadedOperatorExpr->getArg(IntegerConstantIsFirstArg ? 1 : 0);
OperandExpr = OverloadedOperatorExpr;
diff --git a/clang-tools-extra/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp b/clang-tools-extra/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp
index db3a69029c069..fc739a020c1ef 100644
--- a/clang-tools-extra/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp
+++ b/clang-tools-extra/clang-tidy/misc/ThrowByValueCatchByReferenceCheck.cpp
@@ -103,10 +103,10 @@ void ThrowByValueCatchByReferenceCheck::diagnoseThrowLocations(
// If we have a DeclRefExpr, we flag for emitting a diagnosis message in
// case the referenced variable is neither a function parameter nor a
// variable declared in the catch statement.
- if (VariableReference)
+ if (VariableReference) {
Emit = !isFunctionOrCatchVar(VariableReference);
- else if (ConstructorCall &&
- ConstructorCall->getConstructor()->isCopyOrMoveConstructor()) {
+ } else if (ConstructorCall &&
+ ConstructorCall->getConstructor()->isCopyOrMoveConstructor()) {
// If we have a copy / move construction, we emit a diagnosis message if
// the object that we copy construct from is neither a function parameter
// nor a variable declared in a catch statement
diff --git a/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp b/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp
index 94a28cef30a80..3f522041b863d 100644
--- a/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp
@@ -185,8 +185,9 @@ static bool anyDescendantIsLocal(const Stmt *Statement) {
if (Var->isLocalVarDeclOrParm())
return true;
}
- } else if (isa<CXXThisExpr>(Statement))
+ } else if (isa<CXXThisExpr>(Statement)) {
return true;
+ }
return any_of(Statement->children(), anyDescendantIsLocal);
}
@@ -365,10 +366,11 @@ static void addFunctionCallArgs(ArrayRef<BindArgument> Args,
if (B.Kind == BK_Placeholder) {
Stream << "std::forward<decltype(" << B.UsageIdentifier << ")>";
Stream << "(" << B.UsageIdentifier << ")";
- } else if (B.CM != CM_None)
+ } else if (B.CM != CM_None) {
Stream << B.UsageIdentifier;
- else
+ } else {
Stream << B.SourceTokens;
+ }
Delimiter = ", ";
}
diff --git a/clang-tools-extra/clang-tidy/modernize/AvoidCArraysCheck.cpp b/clang-tools-extra/clang-tidy/modernize/AvoidCArraysCheck.cpp
index 71d89d3ab6098..b153e3fb0b824 100644
--- a/clang-tools-extra/clang-tidy/modernize/AvoidCArraysCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/AvoidCArraysCheck.cpp
@@ -147,9 +147,9 @@ void AvoidCArraysCheck::check(const MatchFinder::MatchResult &Result) {
} else if (ArrayTypeLoc.getTypePtr()->isIncompleteArrayType() && IsInParam) {
// in function parameter, we also don't know the size of
// IncompleteArrayType.
- if (Result.Context->getLangOpts().CPlusPlus20)
+ if (Result.Context->getLangOpts().CPlusPlus20) {
RecommendTypes.push_back("'std::span'");
- else {
+ } else {
RecommendTypes.push_back("'std::array'");
RecommendTypes.push_back("'std::vector'");
}
diff --git a/clang-tools-extra/clang-tidy/modernize/AvoidCStyleCastCheck.cpp b/clang-tools-extra/clang-tidy/modernize/AvoidCStyleCastCheck.cpp
index 76f2030158c81..94eb0a59c6fbd 100644
--- a/clang-tools-extra/clang-tidy/modernize/AvoidCStyleCastCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/AvoidCStyleCastCheck.cpp
@@ -81,8 +81,9 @@ static StringRef getDestTypeString(const SourceManager &SM,
} else if (const auto *CastExpr = dyn_cast<CXXFunctionalCastExpr>(Expr)) {
BeginLoc = CastExpr->getBeginLoc();
EndLoc = CastExpr->getLParenLoc().getLocWithOffset(-1);
- } else
+ } else {
llvm_unreachable("Unsupported CastExpr");
+ }
return Lexer::getSourceText(CharSourceRange::getTokenRange(BeginLoc, EndLoc),
SM, LangOpts);
diff --git a/clang-tools-extra/clang-tidy/modernize/DeprecatedIosBaseAliasesCheck.cpp b/clang-tools-extra/clang-tidy/modernize/DeprecatedIosBaseAliasesCheck.cpp
index 7e43165fb09f1..ddce19c00979c 100644
--- a/clang-tools-extra/clang-tidy/modernize/DeprecatedIosBaseAliasesCheck.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/DeprecatedIosBaseAliasesCheck.cpp
@@ -67,8 +67,9 @@ void DeprecatedIosBaseAliasesCheck::check(
if (Fix)
Builder << FixItHint::CreateReplacement(SourceRange(IoStateLoc, EndLoc),
FixName);
- } else
+ } else {
diag(IoStateLoc, "'std::ios_base::%0' is deprecated") << TypeName;
+ }
}
} // namespace clang::tidy::modernize
diff --git a/clang-tools-extra/clang-tidy/modernize/IntegralLiteralExpressionMatcher.cpp b/clang-tools-extra/clang-tidy/modernize/IntegralLiteralExpressionMatcher.cpp
index 862ca184ecd97..192ee21aca1c0 100644
--- a/clang-tools-extra/clang-tidy/modernize/IntegralLiteralExpressionMatcher.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/IntegralLiteralExpressionMatcher.cpp
@@ -107,9 +107,9 @@ static LiteralSize literalTokenSize(const Token &Tok) {
if (std::isdigit(Text[End]))
break;
- if (std::toupper(Text[End]) == 'U')
+ if (std::toupper(Text[End]) == 'U') {
SeenUnsigned = true;
- else if (std::toupper(Text[End]) == 'L') {
+ } else if (std::toupper(Text[End]) == 'L') {
if (SeenLong)
SeenLongLong = true;
SeenLong = true;
diff --git a/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp b/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp
index c899018ba439e..e9932ba444bc9 100644
--- a/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp
+++ b/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp
@@ -795,9 +795,9 @@ bool ForLoopIndexUseVisitor::VisitDeclStmt(DeclStmt *S) {
AliasDecl = S;
if (CurrStmtParent) {
if (isa<IfStmt>(CurrStmtParent) || isa<WhileStmt>(CurrStmtParent) ||
- isa<SwitchStmt>(CurrStmtParent))
+ isa<SwitchStmt>(CurrStmtParent)) {
ReplaceWithAliasUse = true;
- else if (isa<ForStmt>(CurrStmtParent)) {
+ } else if (isa<ForStmt>(CurrStmtParent)) {
if (cast<ForStmt>(CurrStmtParent)->getConditionVariableDeclStmt() == S)
ReplaceWithAliasUse = true;
else
diff --git a/clang-tools-extra/clang-tidy/readability/ContainerSizeEmptyCheck.cpp b/clang-tools-extra/clang-tidy/readability/ContainerSizeEmptyCheck.cpp
index f171cd0f44af4..780a965778551 100644
--- a/clang-tools-extra/clang-tidy/readability/ContainerSizeEmptyCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/ContainerSizeEmptyCheck.cpp
@@ -277,10 +277,11 @@ void ContainerSizeEmptyCheck::check(const MatchFinder::MatchResult &Result) {
ReplacementText += "empty()";
} else if (E->isImplicitCXXThis()) {
ReplacementText += "empty()";
- } else if (E->getType()->isPointerType())
+ } else if (E->getType()->isPointerType()) {
ReplacementText += "->empty()";
- else
+ } else {
ReplacementText += ".empty()";
+ }
if (BinCmp) {
if (BinCmp->getOperator() == OO_ExclaimEqual)
diff --git a/clang-tools-extra/clang-tidy/readability/DuplicateIncludeCheck.cpp b/clang-tools-extra/clang-tidy/readability/DuplicateIncludeCheck.cpp
index 4cf2b2acc3461..96b9006a97959 100644
--- a/clang-tools-extra/clang-tidy/readability/DuplicateIncludeCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/DuplicateIncludeCheck.cpp
@@ -117,8 +117,9 @@ void DuplicateIncludeCallbacks::InclusionDirective(
advanceBeyondCurrentLine(SM, FilenameRange.getEnd(), 1);
Check.diag(HashLoc, "duplicate include")
<< FixItHint::CreateRemoval(SourceRange{Start, End});
- } else
+ } else {
Files.back().push_back(FileName);
+ }
}
void DuplicateIncludeCallbacks::MacroDefined(const Token &MacroNameTok,
diff --git a/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.cpp b/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.cpp
index 1d8c4f8b58d8f..13540903a9d24 100644
--- a/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/FunctionCognitiveComplexityCheck.cpp
@@ -115,8 +115,9 @@ struct CognitiveComplexity final {
} else if (C == Criteria::IncrementNesting) {
Increment = 0; // Unused in this message.
MsgId = 3;
- } else
+ } else {
llvm_unreachable("should not get to here.");
+ }
return {MsgId, Increment};
}
diff --git a/clang-tools-extra/clang-tidy/readability/QualifiedAutoCheck.cpp b/clang-tools-extra/clang-tidy/readability/QualifiedAutoCheck.cpp
index 9390c29c27f48..afb8c800a70e2 100644
--- a/clang-tools-extra/clang-tidy/readability/QualifiedAutoCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/QualifiedAutoCheck.cpp
@@ -193,8 +193,9 @@ void QualifiedAutoCheck::check(const MatchFinder::MatchResult &Result) {
if (std::optional<SourceRange> TypeSpec =
getTypeSpecifierLocation(Var, Result)) {
TypeSpecifier = *TypeSpec;
- } else
+ } else {
return;
+ }
llvm::SmallVector<SourceRange, 4> RemoveQualifiersRange;
auto CheckQualifier = [&](bool IsPresent, Qualifier Qual) {
diff --git a/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp b/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp
index 576603a978e3f..2d6253666354e 100644
--- a/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp
+++ b/clang-tools-extra/clang-tidy/readability/SuspiciousCallArgumentCheck.cpp
@@ -188,8 +188,9 @@ static bool applySubstringHeuristic(StringRef Arg, StringRef Param,
Current[J] = 1 + Previous[J - 1];
MaxLength = std::max(MaxLength, Current[J]);
- } else
+ } else {
Current[J] = 0;
+ }
}
Current.swap(Previous);
diff --git a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
index 2b2e53dc0be19..f2115522ca40d 100644
--- a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
+++ b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp
@@ -524,11 +524,11 @@ static bool verifyChecks(const StringSet<> &AllChecks, StringRef CheckGlob,
if (llvm::none_of(AllChecks.keys(),
[&Item](StringRef S) { return Item.Regex.match(S); })) {
AnyInvalid = true;
- if (Item.Text.contains('*'))
+ if (Item.Text.contains('*')) {
llvm::WithColor::warning(llvm::errs(), Source)
<< "check glob '" << Item.Text << "' doesn't match any known check"
<< VerifyConfigWarningEnd;
- else {
+ } else {
llvm::raw_ostream &Output =
llvm::WithColor::warning(llvm::errs(), Source)
<< "unknown check '" << Item.Text << '\'';
diff --git a/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp b/clang-tools-extra/clang-tidy/utils/ExceptionAnalyzer.cpp
index 3f8bca6ac4d87..60dade82e61...
[truncated]
``````````
</details>
https://github.com/llvm/llvm-project/pull/182764
More information about the cfe-commits
mailing list