Skip to content

Carving out -Wformat warning about scoped enums into a subwarning #88595

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 12 commits into from
Apr 22, 2024
Merged

Carving out -Wformat warning about scoped enums into a subwarning #88595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
29d2d19
Carving out -Wformat warning about scoped enums into a subwarning
ZijunZhaoCCK Apr 13, 2024
73ae9dc
Merge branch 'llvm:main' into sw
ZijunZhaoCCK Apr 15, 2024
46e8d90
Carving out -Wformat warning about scoped enums into a subwarning
ZijunZhaoCCK Apr 13, 2024
7cf2b11
Merge branch 'llvm:main' into sw
ZijunZhaoCCK Apr 16, 2024
e1fc0fa
Carving out -Wformat warning about scoped enums into a subwarning
ZijunZhaoCCK Apr 16, 2024
200550c
Merge branch 'llvm:main' into sw
ZijunZhaoCCK Apr 16, 2024
f31fd9c
Carving out -Wformat warning about scoped enums into a subwarning
ZijunZhaoCCK Apr 16, 2024
b8268ea
Merge branch 'llvm:main' into sw
ZijunZhaoCCK Apr 17, 2024
f75602e
Carving out -Wformat warning about scoped enums into a subwarning
ZijunZhaoCCK Apr 16, 2024
068b1e7
Merge branch 'llvm:main' into sw
ZijunZhaoCCK Apr 18, 2024
2de11ed
Carving out -Wformat warning about scoped enums into a subwarning
ZijunZhaoCCK Apr 16, 2024
9a57c0a
Carving out -Wformat warning about scoped enums into a subwarning
ZijunZhaoCCK Apr 16, 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
2 changes: 2 additions & 0 deletions clang/docs/ReleaseNotes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,8 @@ Modified Compiler Flags
f3 *c = (f3 *)x;
}

- Carved out ``-Wformat`` warning about scoped enums into a subwarning and
make it controlled by ``-Wformat-pedantic``. Fixes #GH88595.

Removed Compiler Flags
-------------------------
Expand Down
11 changes: 8 additions & 3 deletions clang/lib/Sema/SemaChecking.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12755,10 +12755,15 @@ CheckPrintfHandler::checkFormatExpr(const analyze_printf::PrintfSpecifier &FS,
// In this case, the expression could be printed using a different
// specifier, but we've decided that the specifier is probably correct
// and we should cast instead. Just use the normal warning message.

unsigned Diag =
IsScopedEnum
? diag::warn_format_conversion_argument_type_mismatch_pedantic
: diag::warn_format_conversion_argument_type_mismatch;

EmitFormatDiagnostic(
S.PDiag(diag::warn_format_conversion_argument_type_mismatch)
<< AT.getRepresentativeTypeName(S.Context) << ExprTy << IsEnum
<< E->getSourceRange(),
S.PDiag(Diag) << AT.getRepresentativeTypeName(S.Context) << ExprTy
<< IsEnum << E->getSourceRange(),
E->getBeginLoc(), /*IsStringLocation*/ false, SpecRange, Hints);
}
}
Expand Down
4 changes: 2 additions & 2 deletions clang/test/FixIt/format-darwin-enum-class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %clang_cc1 -triple x86_64-apple-darwin -fsyntax-only -verify -Wformat %s
// RUN: %clang_cc1 -triple x86_64-apple-darwin -fsyntax-only -fdiagnostics-parseable-fixits -Wformat %s 2>&1 | FileCheck %s
// RUN: %clang_cc1 -triple x86_64-apple-darwin -fsyntax-only -verify -Wformat-pedantic %s
// RUN: %clang_cc1 -triple x86_64-apple-darwin -fsyntax-only -fdiagnostics-parseable-fixits -Wformat-pedantic %s 2>&1 | FileCheck %s

extern "C" int printf(const char * restrict, ...);

Expand Down
6 changes: 4 additions & 2 deletions clang/test/FixIt/format.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wformat %s
// RUN: %clang_cc1 -fsyntax-only -fdiagnostics-parseable-fixits -Wformat %s 2>&1 | FileCheck %s
// RUN: %clang_cc1 -fsyntax-only -verify -Wformat-pedantic %s
// RUN: %clang_cc1 -fsyntax-only -fdiagnostics-parseable-fixits -Wformat-pedantic %s 2>&1 | FileCheck %s
// RUN: %clang_cc1 -fsyntax-only -fdiagnostics-parseable-fixits -Wformat %s -verify=okay
// okay-no-diagnostics

extern "C" int printf(const char *, ...);
#define LOG(...) printf(__VA_ARGS__)
Expand Down
4 changes: 2 additions & 2 deletions clang/test/SemaCXX/format-strings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify -Wformat-nonliteral -Wformat-non-iso -fblocks %s
// RUN: %clang_cc1 -fsyntax-only -verify -Wformat-nonliteral -Wformat-non-iso -Wformat-pedantic -fblocks %s
// RUN: %clang_cc1 -fsyntax-only -verify -Wformat-nonliteral -Wformat-non-iso -fblocks -std=c++98 %s
// RUN: %clang_cc1 -fsyntax-only -verify -Wformat-nonliteral -Wformat-non-iso -fblocks -std=c++11 %s
// RUN: %clang_cc1 -fsyntax-only -verify -Wformat-nonliteral -Wformat-non-iso -Wformat-pedantic -fblocks -std=c++11 %s

#include <stdarg.h>

Expand Down