simon_tatham updated this revision to Diff 240626.
simon_tatham added a comment.
Removed the special case for `MSCompatibilityVersion == 0`. If the default
compatibility setting needs to be changed, that's a separate piece of work and
should be done by someone who understands more than I do about all those
failing tests :-) The new version of this patch just uses the existing default.
With the typical command line I use with the `clang-cl` driver, a specific
version has been set anyway by the time cc1 is running. So probably I shouldn't
have been worrying in the first place about what happens if there isn't one set.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D73457/new/
https://reviews.llvm.org/D73457
Files:
clang/lib/AST/FormatString.cpp
clang/test/Sema/format-strings-ms.c
Index: clang/test/Sema/format-strings-ms.c
===================================================================
--- clang/test/Sema/format-strings-ms.c
+++ clang/test/Sema/format-strings-ms.c
@@ -1,4 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify -fms-compatibility
-triple=i386-pc-win32 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -fms-compatibility
-triple=i386-pc-win32 -fms-compatibility-version=18 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -fms-compatibility
-triple=i386-pc-win32 -fms-compatibility-version=19 -DSIZE_T_OK %s
// RUN: %clang_cc1 -fsyntax-only -verify -fms-compatibility
-triple=i386-pc-win32 -Wformat-non-iso -DNON_ISO_WARNING %s
int printf(const char *format, ...) __attribute__((format(printf, 1, 2)));
@@ -85,4 +87,11 @@
scanf("%Z", p); // expected-warning{{invalid conversion specifier 'Z'}}
}
+void size_t_test(size_t s) {
+ printf("%zu", s);
+#ifndef SIZE_T_OK
+ // expected-warning@-2 {{length modifier 'z' results in undefined behavior
or no effect with 'u' conversion specifier}}
+#endif
+}
+
#endif
Index: clang/lib/AST/FormatString.cpp
===================================================================
--- clang/lib/AST/FormatString.cpp
+++ clang/lib/AST/FormatString.cpp
@@ -748,6 +748,15 @@
case LengthModifier::AsIntMax:
case LengthModifier::AsSizeT:
case LengthModifier::AsPtrDiff:
+ if (LM.getKind() == LengthModifier::AsSizeT &&
+ Target.getTriple().isOSMSVCRT() &&
+ !LO.isCompatibleWithMSVC(LangOptions::MSVC2015)) {
+ // The standard libraries before MSVC2015 didn't support the 'z' length
+ // modifier for size_t. So if the MS compatibility version is specified
+ // and less than that, reject.
+ return false;
+ }
+
switch (CS.getKind()) {
case ConversionSpecifier::dArg:
case ConversionSpecifier::DArg:
Index: clang/test/Sema/format-strings-ms.c
===================================================================
--- clang/test/Sema/format-strings-ms.c
+++ clang/test/Sema/format-strings-ms.c
@@ -1,4 +1,6 @@
// RUN: %clang_cc1 -fsyntax-only -verify -fms-compatibility -triple=i386-pc-win32 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -fms-compatibility -triple=i386-pc-win32 -fms-compatibility-version=18 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -fms-compatibility -triple=i386-pc-win32 -fms-compatibility-version=19 -DSIZE_T_OK %s
// RUN: %clang_cc1 -fsyntax-only -verify -fms-compatibility -triple=i386-pc-win32 -Wformat-non-iso -DNON_ISO_WARNING %s
int printf(const char *format, ...) __attribute__((format(printf, 1, 2)));
@@ -85,4 +87,11 @@
scanf("%Z", p); // expected-warning{{invalid conversion specifier 'Z'}}
}
+void size_t_test(size_t s) {
+ printf("%zu", s);
+#ifndef SIZE_T_OK
+ // expected-warning@-2 {{length modifier 'z' results in undefined behavior or no effect with 'u' conversion specifier}}
+#endif
+}
+
#endif
Index: clang/lib/AST/FormatString.cpp
===================================================================
--- clang/lib/AST/FormatString.cpp
+++ clang/lib/AST/FormatString.cpp
@@ -748,6 +748,15 @@
case LengthModifier::AsIntMax:
case LengthModifier::AsSizeT:
case LengthModifier::AsPtrDiff:
+ if (LM.getKind() == LengthModifier::AsSizeT &&
+ Target.getTriple().isOSMSVCRT() &&
+ !LO.isCompatibleWithMSVC(LangOptions::MSVC2015)) {
+ // The standard libraries before MSVC2015 didn't support the 'z' length
+ // modifier for size_t. So if the MS compatibility version is specified
+ // and less than that, reject.
+ return false;
+ }
+
switch (CS.getKind()) {
case ConversionSpecifier::dArg:
case ConversionSpecifier::DArg:
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
