This revision was automatically updated to reflect the committed changes.
Closed by commit rGe4e56f91df6a: [clang] Emit `Wformat` for bool value and char
specifier confusion in scanf (authored by Fznamznon).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D159279/new/
https://reviews.llvm.org/D159279
Files:
clang/docs/ReleaseNotes.rst
clang/lib/AST/FormatString.cpp
clang/test/SemaCXX/format-strings-scanf.cpp
Index: clang/test/SemaCXX/format-strings-scanf.cpp
===================================================================
--- clang/test/SemaCXX/format-strings-scanf.cpp
+++ clang/test/SemaCXX/format-strings-scanf.cpp
@@ -29,6 +29,8 @@
void test(void) {
bag b;
+ // expected-warning@+2 {{format specifies type 'char *' but the argument
has type 'bool *'}}
+ // expected-warning@+1 {{format specifies type 'unsigned char *' but the
argument has type 'bool *'}}
scan("%hhi %hhu %hhi %hhu", &b.sc, &b.uc, &b.b, &b.b);
scan("%hi %hu", &b.ss, &b.us);
scan("%i %u", &b.si, &b.ui);
Index: clang/lib/AST/FormatString.cpp
===================================================================
--- clang/lib/AST/FormatString.cpp
+++ clang/lib/AST/FormatString.cpp
@@ -368,8 +368,11 @@
case BuiltinType::SChar:
case BuiltinType::UChar:
case BuiltinType::Char_U:
+ return Match;
case BuiltinType::Bool:
- return Match;
+ if (!Ptr)
+ return Match;
+ break;
}
// "Partially matched" because of promotions?
if (!Ptr) {
@@ -410,11 +413,14 @@
switch (BT->getKind()) {
default:
break;
+ case BuiltinType::Bool:
+ if (Ptr && (T == C.UnsignedCharTy || T == C.SignedCharTy))
+ return NoMatch;
+ [[fallthrough]];
case BuiltinType::Char_S:
case BuiltinType::SChar:
case BuiltinType::Char_U:
case BuiltinType::UChar:
- case BuiltinType::Bool:
if (T == C.UnsignedShortTy || T == C.ShortTy)
return NoMatchTypeConfusion;
if (T == C.UnsignedCharTy || T == C.SignedCharTy)
Index: clang/docs/ReleaseNotes.rst
===================================================================
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -205,6 +205,9 @@
- For function multi-versioning using the ``target`` or ``target_clones``
attributes, remove comdat for internal linkage functions.
(`#65114 <https://github.com/llvm/llvm-project/issues/65114>`_)
+- Clang now reports ``-Wformat`` for bool value and char specifier confusion
+ in scanf. Fixes
+ (`#64987 <https://github.com/llvm/llvm-project/issues/64987>`_)
Bug Fixes to Compiler Builtins
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Index: clang/test/SemaCXX/format-strings-scanf.cpp
===================================================================
--- clang/test/SemaCXX/format-strings-scanf.cpp
+++ clang/test/SemaCXX/format-strings-scanf.cpp
@@ -29,6 +29,8 @@
void test(void) {
bag b;
+ // expected-warning@+2 {{format specifies type 'char *' but the argument has type 'bool *'}}
+ // expected-warning@+1 {{format specifies type 'unsigned char *' but the argument has type 'bool *'}}
scan("%hhi %hhu %hhi %hhu", &b.sc, &b.uc, &b.b, &b.b);
scan("%hi %hu", &b.ss, &b.us);
scan("%i %u", &b.si, &b.ui);
Index: clang/lib/AST/FormatString.cpp
===================================================================
--- clang/lib/AST/FormatString.cpp
+++ clang/lib/AST/FormatString.cpp
@@ -368,8 +368,11 @@
case BuiltinType::SChar:
case BuiltinType::UChar:
case BuiltinType::Char_U:
+ return Match;
case BuiltinType::Bool:
- return Match;
+ if (!Ptr)
+ return Match;
+ break;
}
// "Partially matched" because of promotions?
if (!Ptr) {
@@ -410,11 +413,14 @@
switch (BT->getKind()) {
default:
break;
+ case BuiltinType::Bool:
+ if (Ptr && (T == C.UnsignedCharTy || T == C.SignedCharTy))
+ return NoMatch;
+ [[fallthrough]];
case BuiltinType::Char_S:
case BuiltinType::SChar:
case BuiltinType::Char_U:
case BuiltinType::UChar:
- case BuiltinType::Bool:
if (T == C.UnsignedShortTy || T == C.ShortTy)
return NoMatchTypeConfusion;
if (T == C.UnsignedCharTy || T == C.SignedCharTy)
Index: clang/docs/ReleaseNotes.rst
===================================================================
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -205,6 +205,9 @@
- For function multi-versioning using the ``target`` or ``target_clones``
attributes, remove comdat for internal linkage functions.
(`#65114 <https://github.com/llvm/llvm-project/issues/65114>`_)
+- Clang now reports ``-Wformat`` for bool value and char specifier confusion
+ in scanf. Fixes
+ (`#64987 <https://github.com/llvm/llvm-project/issues/64987>`_)
Bug Fixes to Compiler Builtins
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
