[cfe-commits] r147310 - in /cfe/trunk: lib/Analysis/FormatString.cpp test/SemaCXX/format-strings-0x.cpp test/SemaCXX/format-strings.cpp

[Hans Wennborg]

Author: hans
Date: Wed Dec 28 07:10:50 2011
New Revision: 147310

URL: http://llvm.org/viewvc/llvm-project?rev=147310&view=rev
Log:
Support the 'a' scanf length modifier as an extension in C++.

It should not be supported in C++11, since that uses the C99 standard
library, in which 'a' is a format specifier.

Added:
    cfe/trunk/test/SemaCXX/format-strings-0x.cpp
    cfe/trunk/test/SemaCXX/format-strings.cpp
Modified:
    cfe/trunk/lib/Analysis/FormatString.cpp

Modified: cfe/trunk/lib/Analysis/FormatString.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Analysis/FormatString.cpp?rev=147310&r1=147309&r2=147310&view=diff
==============================================================================
--- cfe/trunk/lib/Analysis/FormatString.cpp (original)
+++ cfe/trunk/lib/Analysis/FormatString.cpp Wed Dec 28 07:10:50 2011
@@ -200,7 +200,7 @@
     case 'L': lmKind = LengthModifier::AsLongDouble; ++I; break;
     case 'q': lmKind = LengthModifier::AsLongLong;   ++I; break;
     case 'a':
-      if (IsScanf && !LO.C99 && !LO.CPlusPlus) {
+      if (IsScanf && !LO.C99 && !LO.CPlusPlus0x) {
         // For scanf in C90, look at the next character to see if this should
         // be parsed as the GNU extension 'a' length modifier. If not, this
         // will be parsed as a conversion specifier.

Added: cfe/trunk/test/SemaCXX/format-strings-0x.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/format-strings-0x.cpp?rev=147310&view=auto
==============================================================================
--- cfe/trunk/test/SemaCXX/format-strings-0x.cpp (added)
+++ cfe/trunk/test/SemaCXX/format-strings-0x.cpp Wed Dec 28 07:10:50 2011
@@ -0,0 +1,13 @@
+// RUN: %clang_cc1 -fsyntax-only -verify -pedantic -std=c++11 %s
+
+extern "C" {
+extern int scanf(const char *restrict, ...);
+extern int printf(const char *restrict, ...);
+}
+
+void f(char **sp, float *fp) {
+  scanf("%as", sp); // expected-warning{{conversion specifies type 'float *' but the argument has type 'char **'}}
+
+  printf("%a", 1.0);
+  scanf("%afoobar", fp);
+}

Added: cfe/trunk/test/SemaCXX/format-strings.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/format-strings.cpp?rev=147310&view=auto
==============================================================================
--- cfe/trunk/test/SemaCXX/format-strings.cpp (added)
+++ cfe/trunk/test/SemaCXX/format-strings.cpp Wed Dec 28 07:10:50 2011
@@ -0,0 +1,15 @@
+// RUN: %clang_cc1 -fsyntax-only -verify -pedantic %s
+
+extern "C" {
+extern int scanf(const char *restrict, ...);
+extern int printf(const char *restrict, ...);
+}
+
+void f(char **sp, float *fp) {
+  // TODO: Warn that the 'a' length modifier is an extension.
+  scanf("%as", sp);
+
+  // TODO: Warn that the 'a' conversion specifier is a C++11 feature.
+  printf("%a", 1.0);
+  scanf("%afoobar", fp);
+}