diff --git a/clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp --- a/clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp +++ b/clang-tools-extra/clang-tidy/bugprone/StandaloneEmptyCheck.cpp @@ -98,6 +98,7 @@ const auto PParentStmtExpr = Result.Nodes.getNodeAs("stexpr"); const auto ParentCompStmt = Result.Nodes.getNodeAs("parent"); const auto *ParentCond = getCondition(Result.Nodes, "parent"); + const auto *ParentReturnStmt = Result.Nodes.getNodeAs("parent"); if (const auto *MemberCall = Result.Nodes.getNodeAs("empty")) { @@ -109,6 +110,9 @@ if (PParentStmtExpr && ParentCompStmt && ParentCompStmt->body_back() == MemberCall->getExprStmt()) return; + // Skip if it's a return statement + if (ParentReturnStmt) + return; SourceLocation MemberLoc = MemberCall->getBeginLoc(); SourceLocation ReplacementLoc = MemberCall->getExprLoc(); @@ -150,6 +154,8 @@ if (PParentStmtExpr && ParentCompStmt && ParentCompStmt->body_back() == NonMemberCall->getExprStmt()) return; + if (ParentReturnStmt) + return; SourceLocation NonMemberLoc = NonMemberCall->getExprLoc(); SourceLocation NonMemberEndLoc = NonMemberCall->getEndLoc(); diff --git a/clang-tools-extra/test/clang-tidy/checkers/bugprone/standalone-empty.cpp b/clang-tools-extra/test/clang-tidy/checkers/bugprone/standalone-empty.cpp --- a/clang-tools-extra/test/clang-tidy/checkers/bugprone/standalone-empty.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/bugprone/standalone-empty.cpp @@ -576,3 +576,16 @@ // CHECK-MESSAGES: :[[#@LINE-1]]:5: warning: ignoring the result of 'std::empty' [bugprone-standalone-empty] } } + +bool test_empty_in_return() { + { + std::vector v; + return v.empty(); + // no-warning + } + { + std::vector v; + return std::empty(v); + // no-warning + } +}