Skip to content

[clang-tidy][NFC] Enable readability-avoid-return-with-void-value check in the codebase #151356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 1, 2025
Merged

[clang-tidy][NFC] Enable readability-avoid-return-with-void-value check in the codebase #151356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dd39dd
[clang-tidy][NFC] Enable `readability-avoid-return-with-void-value` c…
localspook Jul 30, 2025
31b35de
Address feedback
localspook Jul 31, 2025
b7b51fc
Fix build
localspook Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion clang-tools-extra/clang-tidy/.clang-tidy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ Checks: >
-performance-unnecessary-value-param,
readability-*,
-readability-avoid-nested-conditional-operator,
-readability-avoid-return-with-void-value,
-readability-braces-around-statements,
-readability-container-contains,
-readability-convert-member-functions-to-static,
Expand Down
76 changes: 43 additions & 33 deletions clang-tools-extra/clang-tidy/bugprone/NarrowingConversionsCheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,10 +381,11 @@ void NarrowingConversionsCheck::diagNarrowTypeOrConstant(
const Expr &Rhs) {
APValue Constant = getConstantExprValue(Context, Rhs);
if (Constant.isInt())
return diagNarrowIntegerConstant(SourceLoc, Lhs, Rhs, Constant.getInt());
if (Constant.isFloat())
return diagNarrowConstant(SourceLoc, Lhs, Rhs);
return diagNarrowType(SourceLoc, Lhs, Rhs);
diagNarrowIntegerConstant(SourceLoc, Lhs, Rhs, Constant.getInt());
else if (Constant.isFloat())
diagNarrowConstant(SourceLoc, Lhs, Rhs);
else
diagNarrowType(SourceLoc, Lhs, Rhs);
}

void NarrowingConversionsCheck::handleIntegralCast(const ASTContext &Context,
Expand Down Expand Up @@ -460,10 +461,10 @@ void NarrowingConversionsCheck::handleFloatingToIntegral(
llvm::APFloat FloatConstant(0.0);
if (getFloatingConstantExprValue(Context, Rhs, FloatConstant)) {
if (!isFloatExactlyRepresentable(Context, FloatConstant, Lhs.getType()))
return diagNarrowConstant(SourceLoc, Lhs, Rhs);
diagNarrowConstant(SourceLoc, Lhs, Rhs);

if (PedanticMode)
return diagConstantCast(SourceLoc, Lhs, Rhs);
else if (PedanticMode)
diagConstantCast(SourceLoc, Lhs, Rhs);

return;
}
Expand All @@ -478,7 +479,7 @@ void NarrowingConversionsCheck::handleFloatingToIntegral(
void NarrowingConversionsCheck::handleFloatingToBoolean(
const ASTContext &Context, SourceLocation SourceLoc, const Expr &Lhs,
const Expr &Rhs) {
return diagNarrowTypeOrConstant(Context, SourceLoc, Lhs, Rhs);
diagNarrowTypeOrConstant(Context, SourceLoc, Lhs, Rhs);
}

void NarrowingConversionsCheck::handleBooleanToSignedIntegral(
Expand Down Expand Up @@ -532,19 +533,20 @@ void NarrowingConversionsCheck::handleBinaryOperator(const ASTContext &Context,
if (LhsType == RhsType)
return;
if (RhsType->getKind() == BuiltinType::Bool && LhsType->isSignedInteger())
return handleBooleanToSignedIntegral(Context, SourceLoc, Lhs, Rhs);
if (RhsType->isInteger() && LhsType->getKind() == BuiltinType::Bool)
return handleIntegralToBoolean(Context, SourceLoc, Lhs, Rhs);
if (RhsType->isInteger() && LhsType->isFloatingPoint())
return handleIntegralToFloating(Context, SourceLoc, Lhs, Rhs);
if (RhsType->isInteger() && LhsType->isInteger())
return handleIntegralCast(Context, SourceLoc, Lhs, Rhs);
if (RhsType->isFloatingPoint() && LhsType->getKind() == BuiltinType::Bool)
return handleFloatingToBoolean(Context, SourceLoc, Lhs, Rhs);
if (RhsType->isFloatingPoint() && LhsType->isInteger())
return handleFloatingToIntegral(Context, SourceLoc, Lhs, Rhs);
if (RhsType->isFloatingPoint() && LhsType->isFloatingPoint())
return handleFloatingCast(Context, SourceLoc, Lhs, Rhs);
handleBooleanToSignedIntegral(Context, SourceLoc, Lhs, Rhs);
else if (RhsType->isInteger() && LhsType->getKind() == BuiltinType::Bool)
handleIntegralToBoolean(Context, SourceLoc, Lhs, Rhs);
else if (RhsType->isInteger() && LhsType->isFloatingPoint())
handleIntegralToFloating(Context, SourceLoc, Lhs, Rhs);
else if (RhsType->isInteger() && LhsType->isInteger())
handleIntegralCast(Context, SourceLoc, Lhs, Rhs);
else if (RhsType->isFloatingPoint() &&
LhsType->getKind() == BuiltinType::Bool)
handleFloatingToBoolean(Context, SourceLoc, Lhs, Rhs);
else if (RhsType->isFloatingPoint() && LhsType->isInteger())
handleFloatingToIntegral(Context, SourceLoc, Lhs, Rhs);
else if (RhsType->isFloatingPoint() && LhsType->isFloatingPoint())
handleFloatingCast(Context, SourceLoc, Lhs, Rhs);
}

bool NarrowingConversionsCheck::handleConditionalOperator(
Expand Down Expand Up @@ -577,21 +579,28 @@ void NarrowingConversionsCheck::handleImplicitCast(
SourceLocation SourceLoc = Lhs.getExprLoc();
switch (Cast.getCastKind()) {
case CK_BooleanToSignedIntegral:
return handleBooleanToSignedIntegral(Context, SourceLoc, Lhs, Rhs);
handleBooleanToSignedIntegral(Context, SourceLoc, Lhs, Rhs);
return;
case CK_IntegralToBoolean:
return handleIntegralToBoolean(Context, SourceLoc, Lhs, Rhs);
handleIntegralToBoolean(Context, SourceLoc, Lhs, Rhs);
return;
case CK_IntegralToFloating:
return handleIntegralToFloating(Context, SourceLoc, Lhs, Rhs);
handleIntegralToFloating(Context, SourceLoc, Lhs, Rhs);
return;
case CK_IntegralCast:
return handleIntegralCast(Context, SourceLoc, Lhs, Rhs);
handleIntegralCast(Context, SourceLoc, Lhs, Rhs);
return;
case CK_FloatingToBoolean:
return handleFloatingToBoolean(Context, SourceLoc, Lhs, Rhs);
handleFloatingToBoolean(Context, SourceLoc, Lhs, Rhs);
return;
case CK_FloatingToIntegral:
return handleFloatingToIntegral(Context, SourceLoc, Lhs, Rhs);
handleFloatingToIntegral(Context, SourceLoc, Lhs, Rhs);
return;
case CK_FloatingCast:
return handleFloatingCast(Context, SourceLoc, Lhs, Rhs);
handleFloatingCast(Context, SourceLoc, Lhs, Rhs);
return;
default:
break;
return;
}
}

Expand All @@ -610,9 +619,10 @@ void NarrowingConversionsCheck::handleBinaryOperator(const ASTContext &Context,

void NarrowingConversionsCheck::check(const MatchFinder::MatchResult &Result) {
if (const auto *Op = Result.Nodes.getNodeAs<BinaryOperator>("binary_op"))
return handleBinaryOperator(*Result.Context, *Op);
if (const auto *Cast = Result.Nodes.getNodeAs<ImplicitCastExpr>("cast"))
return handleImplicitCast(*Result.Context, *Cast);
llvm_unreachable("must be binary operator or cast expression");
handleBinaryOperator(*Result.Context, *Op);
else if (const auto *Cast = Result.Nodes.getNodeAs<ImplicitCastExpr>("cast"))
handleImplicitCast(*Result.Context, *Cast);
else
llvm_unreachable("must be binary operator or cast expression");
}
} // namespace clang::tidy::bugprone
5 changes: 3 additions & 2 deletions clang-tools-extra/clang-tidy/readability/ImplicitBoolConversionCheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,14 +361,15 @@ void ImplicitBoolConversionCheck::check(
if (const auto *CastToBool =
Result.Nodes.getNodeAs<ImplicitCastExpr>("implicitCastToBool")) {
const auto *Parent = Result.Nodes.getNodeAs<Stmt>("parentStmt");
return handleCastToBool(CastToBool, Parent, *Result.Context);
handleCastToBool(CastToBool, Parent, *Result.Context);
return;
}

if (const auto *CastFromBool =
Result.Nodes.getNodeAs<ImplicitCastExpr>("implicitCastFromBool")) {
const auto *NextImplicitCast =
Result.Nodes.getNodeAs<ImplicitCastExpr>("furtherImplicitCast");
return handleCastFromBool(CastFromBool, NextImplicitCast, *Result.Context);
handleCastFromBool(CastFromBool, NextImplicitCast, *Result.Context);
}
}

Expand Down