Skip to content

[clang] Fix unexpected -Wconstant-logical-operand in C23 #80724

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
Feb 6, 2024
Merged

[clang] Fix unexpected -Wconstant-logical-operand in C23 #80724

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd81e1a
[clang] Fix unexpected `-Wconstant-logical-operand` in C23
Fznamznon Feb 5, 2024
6636576
Merge branch 'main' into 64356
Fznamznon Feb 6, 2024
980e24e
Check another lang option, add a release note
Fznamznon Feb 6, 2024
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
3 changes: 2 additions & 1 deletion clang/lib/Sema/SemaExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14073,7 +14073,8 @@ inline QualType Sema::CheckLogicalOperands(ExprResult &LHS, ExprResult &RHS,
Expr::EvalResult EVResult;
if (RHS.get()->EvaluateAsInt(EVResult, Context)) {
llvm::APSInt Result = EVResult.Val.getInt();
if ((getLangOpts().Bool && !RHS.get()->getType()->isBooleanType() &&
if ((getLangOpts().Bool && !getLangOpts().C23 &&
!RHS.get()->getType()->isBooleanType() &&
!RHS.get()->getExprLoc().isMacroID()) ||
(Result != 0 && Result != 1)) {
Diag(Loc, diag::warn_logical_instead_of_bitwise)
Expand Down
11 changes: 11 additions & 0 deletions clang/test/Sema/warn-int-in-bool-context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,14 @@ int test(int a, unsigned b, enum num n) {
// Don't warn in macros.
return SHIFT(1, a);
}

int GH64356(int arg) {
if ((arg == 1) && (1 == 1)) return 1;
return 0;

if ((64 > 32) && (32 < 64))
return 2;

if ((1 == 1) && (arg == 1)) return 1;
return 0;
}