Author: Baranov Victor Date: 2025-12-18T15:04:06+03:00 New Revision: 0206f18a9cc32493035b90a0d80b59f9f6f23cb8
URL: https://github.com/llvm/llvm-project/commit/0206f18a9cc32493035b90a0d80b59f9f6f23cb8 DIFF: https://github.com/llvm/llvm-project/commit/0206f18a9cc32493035b90a0d80b59f9f6f23cb8.diff LOG: [clang-tidy][NFC] Remove redundant braces with clang-format 'RemoveBracesLLVM' (3/N) (#172752) Added: Modified: clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp clang-tools-extra/clang-tidy/modernize/AvoidCStyleCastCheck.cpp clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp clang-tools-extra/clang-tidy/modernize/MacroToEnumCheck.cpp clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp clang-tools-extra/clang-tidy/modernize/PassByValueCheck.cpp clang-tools-extra/clang-tidy/modernize/RawStringLiteralCheck.cpp clang-tools-extra/clang-tidy/modernize/TypeTraitsCheck.cpp clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp clang-tools-extra/clang-tidy/modernize/UseEmplaceCheck.cpp clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp clang-tools-extra/clang-tidy/modernize/UseUncaughtExceptionsCheck.cpp clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp b/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp index 7663f37615179..94a28cef30a80 100644 --- a/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/AvoidBindCheck.cpp @@ -672,9 +672,8 @@ void AvoidBindCheck::check(const MatchFinder::MatchResult &Result) { Stream << " { "; - if (LP.Callable.DoesReturn) { + if (LP.Callable.DoesReturn) Stream << "return "; - } if (LP.Callable.Type == CT_Function) { StringRef SourceTokens = LP.Callable.SourceTokens; diff --git a/clang-tools-extra/clang-tidy/modernize/AvoidCStyleCastCheck.cpp b/clang-tools-extra/clang-tidy/modernize/AvoidCStyleCastCheck.cpp index 7f9bf63972486..76f2030158c81 100644 --- a/clang-tools-extra/clang-tidy/modernize/AvoidCStyleCastCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/AvoidCStyleCastCheck.cpp @@ -212,11 +212,10 @@ void AvoidCStyleCastCheck::check(const MatchFinder::MatchResult &Result) { ReplaceWithNamedCast("static_cast"); return; case CK_ConstructorConversion: - if (ConstructorCast) { + if (ConstructorCast) ReplaceWithConstructorCall(); - } else { + else ReplaceWithNamedCast("static_cast"); - } return; case CK_NoOp: if (FnToFnCast) { diff --git a/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp b/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp index ce01a85f70fde..180706d9d4bff 100644 --- a/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp @@ -641,9 +641,8 @@ void LoopConvertCheck::doConversion( VarNameOrStructuredBinding = "["; assert(!AliasDecompositionDecl->bindings().empty() && "No bindings"); - for (const BindingDecl *Binding : AliasDecompositionDecl->bindings()) { + for (const BindingDecl *Binding : AliasDecompositionDecl->bindings()) VarNameOrStructuredBinding += Binding->getName().str() + ", "; - } VarNameOrStructuredBinding.erase(VarNameOrStructuredBinding.size() - 2, 2); @@ -845,9 +844,8 @@ void LoopConvertCheck::getArrayLoopQualifiers(ASTContext *Context, continue; QualType Type = U.Expression->getType().getCanonicalType(); if (U.Kind == Usage::UK_MemberThroughArrow) { - if (!Type->isPointerType()) { + if (!Type->isPointerType()) continue; - } Type = Type->getPointeeType(); } Descriptor.ElemType = Type; @@ -872,27 +870,25 @@ void LoopConvertCheck::getIteratorLoopQualifiers(ASTContext *Context, // canonical const qualification of the init variable type. Descriptor.DerefByConstRef = CanonicalInitVarType.isConstQualified(); Descriptor.ElemType = *DerefByValueType; + } else if (const auto *DerefType = + Nodes.getNodeAs<QualType>(DerefByRefResultName)) { + // A node will only be bound with DerefByRefResultName if we're dealing + // with a user-defined iterator type. Test the const qualification of + // the reference type. + auto ValueType = DerefType->getNonReferenceType(); + + Descriptor.DerefByConstRef = ValueType.isConstQualified(); + Descriptor.ElemType = ValueType; } else { - if (const auto *DerefType = - Nodes.getNodeAs<QualType>(DerefByRefResultName)) { - // A node will only be bound with DerefByRefResultName if we're dealing - // with a user-defined iterator type. Test the const qualification of - // the reference type. - auto ValueType = DerefType->getNonReferenceType(); - - Descriptor.DerefByConstRef = ValueType.isConstQualified(); - Descriptor.ElemType = ValueType; - } else { - // By nature of the matcher this case is triggered only for built-in - // iterator types (i.e. pointers). - assert(isa<PointerType>(CanonicalInitVarType) && - "Non-class iterator type is not a pointer type"); - - // We test for const qualification of the pointed-at type. - Descriptor.DerefByConstRef = - CanonicalInitVarType->getPointeeType().isConstQualified(); - Descriptor.ElemType = CanonicalInitVarType->getPointeeType(); - } + // By nature of the matcher this case is triggered only for built-in + // iterator types (i.e. pointers). + assert(isa<PointerType>(CanonicalInitVarType) && + "Non-class iterator type is not a pointer type"); + + // We test for const qualification of the pointed-at type. + Descriptor.DerefByConstRef = + CanonicalInitVarType->getPointeeType().isConstQualified(); + Descriptor.ElemType = CanonicalInitVarType->getPointeeType(); } } @@ -1086,9 +1082,8 @@ llvm::StringRef LoopConvertCheck::getReverseFunction() const { llvm::StringRef LoopConvertCheck::getReverseHeader() const { if (!ReverseHeader.empty()) return ReverseHeader; - if (UseReverseRanges && ReverseFunction.empty()) { + if (UseReverseRanges && ReverseFunction.empty()) return "<ranges>"; - } return ""; } diff --git a/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp b/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp index f6685dda7e09e..e6392ccc8ac3b 100644 --- a/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp +++ b/clang-tools-extra/clang-tidy/modernize/LoopConvertUtils.cpp @@ -48,10 +48,9 @@ bool StmtAncestorASTVisitor::TraverseStmt(Stmt *Statement) { /// Scope, as we can map a VarDecl to its DeclStmt, then walk up the parent tree /// using StmtAncestors. bool StmtAncestorASTVisitor::VisitDeclStmt(DeclStmt *Statement) { - for (const auto *Decl : Statement->decls()) { + for (const auto *Decl : Statement->decls()) if (const auto *V = dyn_cast<VarDecl>(Decl)) DeclParents.insert(std::make_pair(V, Statement)); - } return true; } @@ -830,9 +829,8 @@ bool ForLoopIndexUseVisitor::TraverseStmt(Stmt *S) { if (const auto *LE = dyn_cast_or_null<LambdaExpr>(NextStmtParent)) { // Any child of a LambdaExpr that isn't the body is an initialization // expression. - if (S != LE->getBody()) { + if (S != LE->getBody()) return true; - } } return traverseStmtImpl(S); } diff --git a/clang-tools-extra/clang-tidy/modernize/MacroToEnumCheck.cpp b/clang-tools-extra/clang-tidy/modernize/MacroToEnumCheck.cpp index 098d46cae5df4..1c49c32f9fecb 100644 --- a/clang-tools-extra/clang-tidy/modernize/MacroToEnumCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/MacroToEnumCheck.cpp @@ -287,17 +287,15 @@ void MacroToEnumCallbacks::checkName(const Token &MacroNameTok) { void MacroToEnumCallbacks::rememberExpressionName(const Token &Tok) { const std::string Id = getTokenName(Tok).str(); auto Pos = llvm::lower_bound(ExpressionNames, Id); - if (Pos == ExpressionNames.end() || *Pos != Id) { + if (Pos == ExpressionNames.end() || *Pos != Id) ExpressionNames.insert(Pos, Id); - } } void MacroToEnumCallbacks::rememberExpressionTokens( ArrayRef<Token> MacroTokens) { - for (const Token Tok : MacroTokens) { + for (const Token Tok : MacroTokens) if (Tok.isAnyIdentifier()) rememberExpressionName(Tok); - } } void MacroToEnumCallbacks::FileChanged(SourceLocation Loc, diff --git a/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp b/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp index 39c5def0c8266..94fb8b418a282 100644 --- a/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/MakeSmartPtrCheck.cpp @@ -28,9 +28,8 @@ static std::string getNewExprName(const CXXNewExpr *NewExpr, CharSourceRange::getTokenRange( NewExpr->getAllocatedTypeSourceInfo()->getTypeLoc().getSourceRange()), SM, Lang); - if (NewExpr->isArray()) { + if (NewExpr->isArray()) return (WrittenName + "[]").str(); - } return WrittenName.str(); } @@ -153,9 +152,8 @@ void MakeSmartPtrCheck::checkConstruct(SourceManager &SM, ASTContext *Ctx, const SourceLocation ConstructCallStart = Construct->getExprLoc(); const bool InMacro = ConstructCallStart.isMacroID(); - if (InMacro && IgnoreMacros) { + if (InMacro && IgnoreMacros) return; - } bool Invalid = false; const StringRef ExprStr = Lexer::getSourceText( @@ -169,13 +167,11 @@ void MakeSmartPtrCheck::checkConstruct(SourceManager &SM, ASTContext *Ctx, << MakeSmartPtrFunctionName; // Disable the fix in macros. - if (InMacro) { + if (InMacro) return; - } - if (!replaceNew(Diag, New, SM, Ctx)) { + if (!replaceNew(Diag, New, SM, Ctx)) return; - } // Find the location of the template's left angle. const size_t LAngle = ExprStr.find('<'); @@ -228,28 +224,24 @@ void MakeSmartPtrCheck::checkReset(SourceManager &SM, ASTContext *Ctx, const bool InMacro = ExprStart.isMacroID(); - if (InMacro && IgnoreMacros) { + if (InMacro && IgnoreMacros) return; - } // There are some cases where we don't have operator ("." or "->") of the // "reset" expression, e.g. call "reset()" method directly in the subclass of // "std::unique_ptr<>". We skip these cases. - if (OperatorLoc.isInvalid()) { + if (OperatorLoc.isInvalid()) return; - } auto Diag = diag(ResetCallStart, "use %0 instead") << MakeSmartPtrFunctionName; // Disable the fix in macros. - if (InMacro) { + if (InMacro) return; - } - if (!replaceNew(Diag, New, SM, Ctx)) { + if (!replaceNew(Diag, New, SM, Ctx)) return; - } Diag << FixItHint::CreateReplacement( CharSourceRange::getCharRange(OperatorLoc, ExprEnd), @@ -439,9 +431,8 @@ bool MakeSmartPtrCheck::replaceNew(DiagnosticBuilder &Diag, } void MakeSmartPtrCheck::insertHeader(DiagnosticBuilder &Diag, FileID FD) { - if (MakeSmartPtrFunctionHeader.empty()) { + if (MakeSmartPtrFunctionHeader.empty()) return; - } Diag << Inserter.createIncludeInsertion(FD, MakeSmartPtrFunctionHeader); } diff --git a/clang-tools-extra/clang-tidy/modernize/PassByValueCheck.cpp b/clang-tools-extra/clang-tidy/modernize/PassByValueCheck.cpp index 09d98ee8bea6f..9f2c3eb65a3ca 100644 --- a/clang-tools-extra/clang-tidy/modernize/PassByValueCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/PassByValueCheck.cpp @@ -65,12 +65,11 @@ AST_MATCHER_P(CXXRecordDecl, isMoveConstructibleInBoundCXXRecordDecl, StringRef, &Node](const ast_matchers::internal::BoundNodesMap &Nodes) -> bool { const auto *BoundClass = Nodes.getNode(this->RecordDeclID).get<CXXRecordDecl>(); - for (const CXXConstructorDecl *Ctor : Node.ctors()) { + for (const CXXConstructorDecl *Ctor : Node.ctors()) if (Ctor->isMoveConstructor() && !Ctor->isDeleted() && (Ctor->getAccess() == AS_public || (BoundClass && isFirstFriendOfSecond(BoundClass, &Node)))) return false; - } return true; }); } diff --git a/clang-tools-extra/clang-tidy/modernize/RawStringLiteralCheck.cpp b/clang-tools-extra/clang-tidy/modernize/RawStringLiteralCheck.cpp index 2c4bddf262721..7e7222c19259e 100644 --- a/clang-tools-extra/clang-tidy/modernize/RawStringLiteralCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/RawStringLiteralCheck.cpp @@ -131,9 +131,8 @@ static std::string createRawStringLiteral(const StringLiteral *Literal, const LangOptions &LangOpts) { const StringRef Bytes = Literal->getBytes(); std::string Delimiter; - for (int I = 0; containsDelimiter(Bytes, Delimiter); ++I) { + for (int I = 0; containsDelimiter(Bytes, Delimiter); ++I) Delimiter = (I == 0) ? DelimiterStem : DelimiterStem + std::to_string(I); - } const std::optional<StringRef> UserDefinedSuffix = createUserDefinedSuffix(Literal, SM, LangOpts); diff --git a/clang-tools-extra/clang-tidy/modernize/TypeTraitsCheck.cpp b/clang-tools-extra/clang-tidy/modernize/TypeTraitsCheck.cpp index 66a6f07efd7bb..0d03006750d07 100644 --- a/clang-tools-extra/clang-tidy/modernize/TypeTraitsCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/TypeTraitsCheck.cpp @@ -211,9 +211,8 @@ static bool checkTemplatedDecl(NestedNameSpecifier NNS, const auto *TST = NNS.getAsType()->getAs<TemplateSpecializationType>(); if (!TST) return false; - if (const TemplateDecl *TD = TST->getTemplateName().getAsTemplateDecl()) { + if (const TemplateDecl *TD = TST->getTemplateName().getAsTemplateDecl()) return isNamedDeclInStdTraitsSet(TD, Set); - } return false; } diff --git a/clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp index 14874e32859e0..bf8af216a0ffb 100644 --- a/clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp @@ -270,11 +270,10 @@ findInsertionForConstraint(const FunctionDecl *Function, ASTContext &Context) { const LangOptions &LangOpts = Context.getLangOpts(); if (const auto *Constructor = dyn_cast<CXXConstructorDecl>(Function)) { - for (const CXXCtorInitializer *Init : Constructor->inits()) { + for (const CXXCtorInitializer *Init : Constructor->inits()) if (Init->getSourceOrder() == 0) return utils::lexer::findPreviousTokenKind(Init->getSourceLocation(), SM, LangOpts, tok::colon); - } if (!Constructor->inits().empty()) return std::nullopt; } diff --git a/clang-tools-extra/clang-tidy/modernize/UseEmplaceCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseEmplaceCheck.cpp index ca97b11b9990b..10ca3c14d066c 100644 --- a/clang-tools-extra/clang-tidy/modernize/UseEmplaceCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/UseEmplaceCheck.cpp @@ -30,15 +30,13 @@ AST_MATCHER_P(NamedDecl, hasAnyNameIgnoringTemplates, std::vector<StringRef>, // example, it'll transform a::b<c<d>>::e<f> to simply a::b::e. std::string FullNameTrimmed; int Depth = 0; - for (const auto &Character : FullName) { - if (Character == '<') { + for (const auto &Character : FullName) + if (Character == '<') ++Depth; - } else if (Character == '>') { + else if (Character == '>') --Depth; - } else if (Depth == 0) { + else if (Depth == 0) FullNameTrimmed.append(1, Character); - } - } // This loop is taken from HasNameMatcher::matchesNodeFullSlow in // clang/lib/ASTMatchers/ASTMatchersInternal.cpp and checks whether @@ -313,15 +311,12 @@ void UseEmplaceCheck::check(const MatchFinder::MatchResult &Result) { Result.Nodes.getNodeAs<MaterializeTemporaryExpr>("temporary_expr"); const CXXMemberCallExpr *Call = [&]() { - if (PushBackCall) { + if (PushBackCall) return PushBackCall; - } - if (PushCall) { + if (PushCall) return PushCall; - } - if (PushFrontCall) { + if (PushFrontCall) return PushFrontCall; - } return EmplacyCall; }(); diff --git a/clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp index 928a00775fe12..754ca3d3b8c31 100644 --- a/clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/UseNullptrCheck.cpp @@ -238,9 +238,8 @@ class CastSequenceVisitor : public RecursiveASTVisitor<CastSequenceVisitor> { auto *CastSubExpr = C->getSubExpr()->IgnoreParens(); // Ignore cast expressions which cast nullptr literal. - if (isa<CXXNullPtrLiteralExpr>(CastSubExpr)) { + if (isa<CXXNullPtrLiteralExpr>(CastSubExpr)) return true; - } if (!FirstSubExpr) FirstSubExpr = CastSubExpr; @@ -286,9 +285,8 @@ class CastSequenceVisitor : public RecursiveASTVisitor<CastSequenceVisitor> { EndLoc = SM.getFileLoc(EndLoc); } - if (!isReplaceableRange(StartLoc, EndLoc, SM)) { + if (!isReplaceableRange(StartLoc, EndLoc, SM)) return skipSubTree(); - } replaceWithNullptr(Check, SM, StartLoc, EndLoc); return true; @@ -395,9 +393,8 @@ class CastSequenceVisitor : public RecursiveASTVisitor<CastSequenceVisitor> { /// - TestLoc is not from a macro expansion. /// - TestLoc is from a diff erent macro expansion. bool expandsFrom(SourceLocation TestLoc, SourceLocation TestMacroLoc) { - if (TestLoc.isFileID()) { + if (TestLoc.isFileID()) return false; - } SourceLocation Loc = TestLoc, MacroLoc; @@ -409,9 +406,8 @@ class CastSequenceVisitor : public RecursiveASTVisitor<CastSequenceVisitor> { Loc = Expansion.getExpansionLocStart(); if (!Expansion.isMacroArgExpansion()) { - if (Loc.isFileID()) { + if (Loc.isFileID()) return Loc == TestMacroLoc; - } // Since Loc is still a macro ID and it's not an argument expansion, we // don't need to do the work of handling an argument expansion. Simply // keep recursively expanding until we hit a FileID or a macro arg @@ -458,10 +454,9 @@ class CastSequenceVisitor : public RecursiveASTVisitor<CastSequenceVisitor> { // they are InitListsExpr (semantic and syntactic form). In this case we // can choose any one here, and the ASTVisitor will take care of // traversing the right one. - for (const auto &Parent : Parents) { + for (const auto &Parent : Parents) if (!Parent.get<InitListExpr>()) return false; - } } const DynTypedNode &Parent = Parents[0]; diff --git a/clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp index 02414668c673c..2b84dcbe4eab8 100644 --- a/clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/UseStdNumbersCheck.cpp @@ -259,32 +259,26 @@ struct MatchBuilder { static std::string getCode(const StringRef Constant, const bool IsFloat, const bool IsLongDouble) { - if (IsFloat) { + if (IsFloat) return ("std::numbers::" + Constant + "_v<float>").str(); - } - if (IsLongDouble) { + if (IsLongDouble) return ("std::numbers::" + Constant + "_v<long double>").str(); - } return ("std::numbers::" + Constant).str(); } static bool isRangeOfCompleteMacro(const clang::SourceRange &Range, const clang::SourceManager &SM, const clang::LangOptions &LO) { - if (!Range.getBegin().isMacroID()) { + if (!Range.getBegin().isMacroID()) return false; - } - if (!clang::Lexer::isAtStartOfMacroExpansion(Range.getBegin(), SM, LO)) { + if (!clang::Lexer::isAtStartOfMacroExpansion(Range.getBegin(), SM, LO)) return false; - } - if (!Range.getEnd().isMacroID()) { + if (!Range.getEnd().isMacroID()) return false; - } - if (!clang::Lexer::isAtEndOfMacroExpansion(Range.getEnd(), SM, LO)) { + if (!clang::Lexer::isAtEndOfMacroExpansion(Range.getEnd(), SM, LO)) return false; - } return true; } @@ -377,9 +371,8 @@ void UseStdNumbersCheck::check(const MatchFinder::MatchResult &Result) { for (const auto &[ConstantName, ConstantValue] : Constants) { const auto *const Match = Result.Nodes.getNodeAs<Expr>(ConstantName); - if (Match == nullptr) { + if (Match == nullptr) continue; - } const auto Range = Match->getSourceRange(); @@ -387,9 +380,8 @@ void UseStdNumbersCheck::check(const MatchFinder::MatchResult &Result) { // We do not want to emit a diagnostic when we are matching a macro, but the // match inside of the macro does not cover the whole macro. - if (IsMacro && !isRangeOfCompleteMacro(Range, SM, LO)) { + if (IsMacro && !isRangeOfCompleteMacro(Range, SM, LO)) continue; - } if (const auto PatternBindString = (ConstantName + "_pattern").str(); Result.Nodes.getNodeAs<Expr>(PatternBindString) != nullptr) { @@ -411,9 +403,8 @@ void UseStdNumbersCheck::check(const MatchFinder::MatchResult &Result) { // We may have had no matches with literals, but a match with a pattern that // was a part of a macro which was therefore skipped. - if (MatchedLiterals.empty()) { + if (MatchedLiterals.empty()) return; - } llvm::sort(MatchedLiterals, llvm::less_second()); @@ -424,9 +415,8 @@ void UseStdNumbersCheck::check(const MatchFinder::MatchResult &Result) { // We do not want to emit a diagnostic when we are matching a macro, but the // match inside of the macro does not cover the whole macro. - if (IsMacro && !isRangeOfCompleteMacro(Range, SM, LO)) { + if (IsMacro && !isRangeOfCompleteMacro(Range, SM, LO)) return; - } const auto Code = getCode(Constant, IsFloat, IsLongDouble); diag(Range.getBegin(), diff --git a/clang-tools-extra/clang-tidy/modernize/UseUncaughtExceptionsCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseUncaughtExceptionsCheck.cpp index 08c40d4554488..ae61ffa3ba863 100644 --- a/clang-tools-extra/clang-tidy/modernize/UseUncaughtExceptionsCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/UseUncaughtExceptionsCheck.cpp @@ -80,9 +80,8 @@ void UseUncaughtExceptionsCheck::check(const MatchFinder::MatchResult &Result) { Text.consume_back("()"); const int TextLength = Text.size(); - if (WarnOnly) { + if (WarnOnly) return; - } if (!C) { Diag << FixItHint::CreateInsertion(BeginLoc.getLocWithOffset(TextLength), diff --git a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp index 81d6d8945dc54..2b2e53dc0be19 100644 --- a/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp +++ b/clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp @@ -649,9 +649,8 @@ int clangTidyMain(int argc, const char **argv) { StringRef FileName("dummy"); auto PathList = OptionsParser->getSourcePathList(); - if (!PathList.empty()) { + if (!PathList.empty()) FileName = PathList.front(); - } const SmallString<256> FilePath = makeAbsolute(FileName); ClangTidyOptions EffectiveOptions = OptionsProvider->getOptions(FilePath); _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
