Author: Piotr Zegar Date: 2023-08-27T11:59:02Z New Revision: 01c8bf6fd4132831c971a764559e3d532f5129ae
URL: https://github.com/llvm/llvm-project/commit/01c8bf6fd4132831c971a764559e3d532f5129ae DIFF: https://github.com/llvm/llvm-project/commit/01c8bf6fd4132831c971a764559e3d532f5129ae.diff LOG: [clang-tidy][NFC] Fix llvm-else-after-return findings Fix issues found by clang-tidy in clang-tidy source directory. Added: Modified: clang-tools-extra/clang-tidy/cppcoreguidelines/MisleadingCaptureDefaultByValueCheck.cpp clang-tools-extra/clang-tidy/cppcoreguidelines/RvalueReferenceParamNotMovedCheck.cpp clang-tools-extra/clang-tidy/google/AvoidCStyleCastsCheck.cpp clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp clang-tools-extra/clang-tidy/performance/MoveConstArgCheck.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/MisleadingCaptureDefaultByValueCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/MisleadingCaptureDefaultByValueCheck.cpp index 87e1b058027636..00dfa17a1ccf61 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/MisleadingCaptureDefaultByValueCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/MisleadingCaptureDefaultByValueCheck.cpp @@ -37,9 +37,8 @@ static SourceLocation findDefaultCaptureEnd(const LambdaExpr *Lambda, SourceLocation AddressofLoc = utils::lexer::findPreviousTokenKind( Capture.getLocation(), SourceMgr, Context.getLangOpts(), tok::amp); return AddressofLoc; - } else { - return Capture.getLocation(); } + return Capture.getLocation(); } } return Lambda->getIntroducerRange().getEnd(); diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/RvalueReferenceParamNotMovedCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/RvalueReferenceParamNotMovedCheck.cpp index da49d5610e229e..efcaffb45d9ad8 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/RvalueReferenceParamNotMovedCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/RvalueReferenceParamNotMovedCheck.cpp @@ -31,9 +31,8 @@ AST_MATCHER_P2(Stmt, argumentOf, bool, AllowPartialMove, StatementMatcher, Ref) { if (AllowPartialMove) { return stmt(anyOf(Ref, hasDescendant(Ref))).matches(Node, Finder, Builder); - } else { - return Ref.matches(Node, Finder, Builder); } + return Ref.matches(Node, Finder, Builder); } } // namespace diff --git a/clang-tools-extra/clang-tidy/google/AvoidCStyleCastsCheck.cpp b/clang-tools-extra/clang-tidy/google/AvoidCStyleCastsCheck.cpp index b7dcaf20169ebb..8c62fef6f3f3f9 100644 --- a/clang-tools-extra/clang-tidy/google/AvoidCStyleCastsCheck.cpp +++ b/clang-tools-extra/clang-tidy/google/AvoidCStyleCastsCheck.cpp @@ -62,7 +62,8 @@ static clang::CharSourceRange getReplaceRange(const ExplicitCastExpr *Expr) { return CharSourceRange::getCharRange( CastExpr->getLParenLoc(), CastExpr->getSubExprAsWritten()->getBeginLoc()); - } else if (const auto *CastExpr = dyn_cast<CXXFunctionalCastExpr>(Expr)) { + } + if (const auto *CastExpr = dyn_cast<CXXFunctionalCastExpr>(Expr)) { return CharSourceRange::getCharRange(CastExpr->getBeginLoc(), CastExpr->getLParenLoc()); } else diff --git a/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp b/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp index 37aa26ded42407..bf340984bd3811 100644 --- a/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/LoopConvertCheck.cpp @@ -368,14 +368,14 @@ static std::optional<ContainerCall> getContainerExpr(const Expr *Call) { return ContainerCall{TheCall->getImplicitObjectArgument(), Member->getMemberDecl()->getName(), Member->isArrow(), CallKind}; - } else { - if (TheCall->getDirectCallee() == nullptr || - !MemberNames.contains(TheCall->getDirectCallee()->getName())) - return std::nullopt; - return ContainerCall{TheCall->getArg(0), - TheCall->getDirectCallee()->getName(), false, - CallKind}; } + if (TheCall->getDirectCallee() == nullptr || + !MemberNames.contains(TheCall->getDirectCallee()->getName())) + return std::nullopt; + return ContainerCall{TheCall->getArg(0), + TheCall->getDirectCallee()->getName(), false, + CallKind}; + } else if (const auto *TheCall = dyn_cast_or_null<CallExpr>(Dug)) { if (TheCall->getNumArgs() != 1) return std::nullopt; diff --git a/clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp b/clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp index 75ebfbd381ad8f..310b5bf9affa15 100644 --- a/clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp +++ b/clang-tools-extra/clang-tidy/modernize/UseConstraintsCheck.cpp @@ -168,8 +168,9 @@ matchTrailingTemplateParam(const FunctionTemplateDecl *FunctionTemplate) { return {matchEnableIfSpecialization( LastTemplateParam->getTypeSourceInfo()->getTypeLoc()), LastTemplateParam}; - } else if (const auto *LastTemplateParam = - dyn_cast<TemplateTypeParmDecl>(LastParam)) { + } + if (const auto *LastTemplateParam = + dyn_cast<TemplateTypeParmDecl>(LastParam)) { if (LastTemplateParam->hasDefaultArgument() && LastTemplateParam->getIdentifier() == nullptr) { return {matchEnableIfSpecialization( diff --git a/clang-tools-extra/clang-tidy/performance/MoveConstArgCheck.cpp b/clang-tools-extra/clang-tidy/performance/MoveConstArgCheck.cpp index 413a37f4af9fae..aa54cf284f627b 100644 --- a/clang-tools-extra/clang-tidy/performance/MoveConstArgCheck.cpp +++ b/clang-tools-extra/clang-tidy/performance/MoveConstArgCheck.cpp @@ -73,14 +73,12 @@ bool IsRValueReferenceParam(const Expr *Invocation, Arg->isLValue()) { if (!Invocation->getType()->isRecordType()) return true; - else { - if (const auto *ConstructCallExpr = - dyn_cast<CXXConstructExpr>(Invocation)) { - if (const auto *ConstructorDecl = ConstructCallExpr->getConstructor()) { - if (!ConstructorDecl->isCopyOrMoveConstructor() && - !ConstructorDecl->isDefaultConstructor()) - return true; - } + if (const auto *ConstructCallExpr = + dyn_cast<CXXConstructExpr>(Invocation)) { + if (const auto *ConstructorDecl = ConstructCallExpr->getConstructor()) { + if (!ConstructorDecl->isCopyOrMoveConstructor() && + !ConstructorDecl->isDefaultConstructor()) + return true; } } } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
