Merge pull request #8294 from diffblue/VS-static-assert

Visual Studio has added _Static_assert

Author: tautschnig

regression/ansi-c/_Static_assert1/main.c

@@ -1,17 +1,9 @@
-
-// Not yet available in Visual Studio
-
-#ifdef _MSC_VER
-
-int main()
-{
-}
-
-#else
-
 struct S
 {
+  // Visual Studio does not support _Static_assert in compound bodies.
+#ifndef _MSC_VER
   _Static_assert(1, "in struct");
+#endif
   int x;
 } asd;
 
@@ -21,5 +13,3 @@ int main()
 {
   _Static_assert(1, "in function");
 }
-
-#endif

regression/ansi-c/_Static_assert2/global.desc

@@ -1,4 +1,4 @@
-CORE gcc-only
+CORE
 global.c
 
 static assertion failed: must fail

regression/ansi-c/_Static_assert2/local.desc

@@ -1,4 +1,4 @@
-CORE gcc-only
+CORE
 local.c
 
 static assertion failed: must fail

regression/ansi-c/_Static_assert2/not_constant.desc

@@ -1,4 +1,4 @@
-CORE gcc-only
+CORE
 not_constant.c
 
 expected constant expression

regression/ansi-c/anonymous_member1/main.c

@@ -1,8 +1,3 @@
-#ifdef _MSC_VER
-// No _Static_assert in Visual Studio
-#  define _Static_assert(condition, message) static_assert(condition, message)
-#endif
-
 struct S
 {
   struct

regression/ansi-c/simplify-overflow/main.c

@@ -1,7 +1,3 @@
-#ifdef _MSC_VER
-#  define _Static_assert static_assert
-#endif
-
 int main()
 {
   _Static_assert(!__CPROVER_overflow_plus(1, 2), "");

regression/ansi-c/sizeof2/main.c

@@ -1,11 +1,3 @@
-#ifdef _MSC_VER
-
-// No _Static_assert in Visual Studio
-#define _Static_assert(condition, message) \
-  int some_array##__LINE__[(condition) ? 1 : -1];
-
-#endif
-
 // sizeof is unsigned
 _Static_assert( 1 - sizeof(int) >=0, "sizeof is unsigned" );
 

regression/cbmc/Bitfields5/main.c

@@ -7,10 +7,6 @@ struct S0
   int x;
 };
 
-#ifdef _MSC_VER
-#  define _Static_assert static_assert
-#endif
-
 int main()
 {
   struct S0 g = {0};

regression/cbmc/inequality-with-constant-normalisation1/main.c

@@ -1,9 +1,5 @@
 #include <assert.h>
 
-#ifdef _MSC_VER
-#  define _Static_assert(x, m) static_assert(x, m)
-#endif
-
 int main()
 {
   _Bool b1, b2;

regression/cbmc/member_bounds3/main.c

@@ -8,10 +8,6 @@ struct S
 };
 #pragma pack(pop)
 
-#ifdef _MSC_VER
-#  define _Static_assert(x, m) static_assert(x, m)
-#endif
-
 int main()
 {
   int A[3];

src/ansi-c/scanner.l

@@ -876,8 +876,9 @@ or_eq               { return cpp98_keyword(TOK_ORASSIGN); }
 private             { return cpp98_keyword(TOK_PRIVATE); }
 protected           { return cpp98_keyword(TOK_PROTECTED); }
 public              { return cpp98_keyword(TOK_PUBLIC); }
-static_assert       { // C++11, but Visual Studio supports it in all modes (and
-                      // doesn't support _Static_assert)
+static_assert       { // C++11, but Visual Studio supports it in all modes
+                      // as a keyword, even though the documentation claims
+                      // it's a macro.
                       if(PARSER.mode == configt::ansi_ct::flavourt::VISUAL_STUDIO)
                       {
                         loc(); return TOK_STATIC_ASSERT;
@@ -1490,10 +1491,7 @@ __decltype          { if(PARSER.cpp98 &&
 
   /* This is a C11 keyword */
 
-"_Static_assert" { if(!PARSER.cpp98 &&
-                      (PARSER.mode==configt::ansi_ct::flavourt::GCC ||
-                      PARSER.mode==configt::ansi_ct::flavourt::CLANG ||
-                       PARSER.mode==configt::ansi_ct::flavourt::ARM))
+"_Static_assert" { if(!PARSER.cpp98)
                     { loc(); return TOK_STATIC_ASSERT; }
                   else
                     return make_identifier();