Skip to content

[clang] Avoid warnings about enum mismatch in ternary expressions. NFC. #159338

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 2 commits into from
Sep 17, 2025
Merged

[clang] Avoid warnings about enum mismatch in ternary expressions. NFC. #159338

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80607ae
[clang] Avoid warnings about enum mismatch in ternary expressions. NFC.
mstorsjo Sep 17, 2025
44cc6a8
Split the if statement instead of using an inline ternary expression.
mstorsjo Sep 17, 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
6 changes: 4 additions & 2 deletions clang/lib/Sema/SemaDeclAttr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6837,8 +6837,10 @@ ProcessDeclAttribute(Sema &S, Scope *scope, Decl *D, const ParsedAttr &AL,
!AL.existsInTarget(S.Context.getTargetInfo())) {
if (AL.isRegularKeywordAttribute() || AL.isDeclspecAttribute()) {
S.Diag(AL.getLoc(), AL.isRegularKeywordAttribute()
? diag::err_keyword_not_supported_on_target
: diag::warn_unhandled_ms_attribute_ignored)
? static_cast<unsigned>(
diag::err_keyword_not_supported_on_target)
: static_cast<unsigned>(
diag::warn_unhandled_ms_attribute_ignored))
<< AL.getAttrName() << AL.getRange();
} else {
S.DiagnoseUnknownAttribute(AL);
Expand Down
6 changes: 4 additions & 2 deletions clang/lib/Sema/SemaStmtAttr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,8 +674,10 @@ static Attr *ProcessStmtAttribute(Sema &S, Stmt *St, const ParsedAttr &A,
A.existsInTarget(*Aux)))) {
if (A.isRegularKeywordAttribute() || A.isDeclspecAttribute()) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I agree with corentin, just breaking this up into 2 branches (an if (A.isRegularKeywordAttribute()) and else if (A.isDeclspecAttribute()) is probably better. As it is, we're basically checking the regular keyword 2x.

Else, this patch is fine for me.

S.Diag(A.getLoc(), A.isRegularKeywordAttribute()
? diag::err_keyword_not_supported_on_target
: diag::warn_unhandled_ms_attribute_ignored)
? static_cast<unsigned>(
diag::err_keyword_not_supported_on_target)
: static_cast<unsigned>(
diag::warn_unhandled_ms_attribute_ignored))
<< A << A.getRange();
} else {
S.DiagnoseUnknownAttribute(A);
Expand Down