Ensure __LINE__ is expanded

tautschnig · tautschnig · commit 11a9e0915f94 · 2019-04-19T14:23:57.000Z
We previously generated several declarations with the same name, because
the C preprocessor does not expand __LINE__ after a concatenation
operator. Add two levels of indirection to achieve this. Using
declarations with the same name was kind of ok for the C front-end, but
is a bug with any C++ front-end.
diff --git a/regression/ansi-c/Struct_Bitfields1/main.c b/regression/ansi-c/Struct_Bitfields1/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 struct S1
 {
diff --git a/regression/ansi-c/Struct_Enum_Padding1/main.c b/regression/ansi-c/Struct_Enum_Padding1/main.c
@@ -2,8 +2,11 @@
 
 #include <inttypes.h>
 
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1]
+#  define CONCAT(a, b) a##b
+#  define CONCAT2(a, b) CONCAT(a, b)
+
+#  define STATIC_ASSERT(condition)                                             \
+    int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 // Debian package openvswitch
 enum __attribute__((__packed__)) ofpact_type {
diff --git a/regression/ansi-c/Struct_Initialization1/main.c b/regression/ansi-c/Struct_Initialization1/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1]
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 struct A {
   int x;
diff --git a/regression/ansi-c/Struct_Initialization2/main.c b/regression/ansi-c/Struct_Initialization2/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1]
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 struct A {
   int x;
diff --git a/regression/ansi-c/Struct_Padding2/main.c b/regression/ansi-c/Struct_Padding2/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1]
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 enum {
  RTAX_UNSPEC,
diff --git a/regression/ansi-c/Struct_Padding3/main.c b/regression/ansi-c/Struct_Padding3/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1]
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 #ifndef __GNUC__
 #define __builtin_offsetof(a, b) ((unsigned long long)&(((a *)0)->b))
diff --git a/regression/ansi-c/Struct_Padding4/main.c b/regression/ansi-c/Struct_Padding4/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1]
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 struct Z1
 {
diff --git a/regression/ansi-c/Struct_Padding5/main.c b/regression/ansi-c/Struct_Padding5/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1]
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 #ifdef _MSC_VER
 
diff --git a/regression/ansi-c/Struct_Padding6/main.c b/regression/ansi-c/Struct_Padding6/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1]
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 #pragma pack(4)
 
diff --git a/regression/ansi-c/Union_Padding1/main.c b/regression/ansi-c/Union_Padding1/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1]
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 #ifdef _MSC_VER
 
diff --git a/regression/ansi-c/Universal_characters1/main.c b/regression/ansi-c/Universal_characters1/main.c
@@ -1,8 +1,11 @@
 int identifier_\u0201_;
 int \u0201_abc;
 
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 char my_string[]="\u0201";
 STATIC_ASSERT(sizeof(my_string)==3);
diff --git a/regression/ansi-c/_Alignof1/main.c b/regression/ansi-c/_Alignof1/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 // C11: _Alignof
 // 6.5.3.4
diff --git a/regression/ansi-c/_Bool1/main.c b/regression/ansi-c/_Bool1/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 // C11:
 // 6.3.1.2 Boolean type
diff --git a/regression/ansi-c/_Generic1/main.c b/regression/ansi-c/_Generic1/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 #define G(X) _Generic((X), \
                 long double: 1, \
diff --git a/regression/ansi-c/array_initialization1/main.c b/regression/ansi-c/array_initialization1/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1]
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 // 6.7.9, 14: An array of character type may be initialized by a character
 // string literal or UTF−8 string literal, optionally enclosed in braces.
diff --git a/regression/ansi-c/array_initialization3/main.c b/regression/ansi-c/array_initialization3/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT_sizeof(condition) \
-  int[(condition) ? 1 : -1]
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 int A[];
 int B[];
diff --git a/regression/ansi-c/bitfields1/main.c b/regression/ansi-c/bitfields1/main.c
@@ -1,6 +1,10 @@
 #include <limits.h>
 
-#define STATIC_ASSERT(condition) int some_array##__LINE__[(condition) ? 1 : -1]
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 #if CHAR_BIT == 8
 struct bits
diff --git a/regression/ansi-c/character_literals1/main.c b/regression/ansi-c/character_literals1/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 // character literals such as are of type int in C
 STATIC_ASSERT(sizeof('a')==sizeof(int));
diff --git a/regression/ansi-c/cprover_bool1/main.c b/regression/ansi-c/cprover_bool1/main.c
@@ -1,4 +1,8 @@
-#define STATIC_ASSERT(condition) int some_array##__LINE__[(condition) ? 1 : -1]
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 struct bits
 {
diff --git a/regression/ansi-c/enum3/main.c b/regression/ansi-c/enum3/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1]
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 #if defined(__GNUC__)
 
diff --git a/regression/ansi-c/float_constant1/main.c b/regression/ansi-c/float_constant1/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 // hex-based constants
 STATIC_ASSERT(0x1.0p-95f == 2.524355e-29f);
diff --git a/regression/ansi-c/gcc_attributes10/main.c b/regression/ansi-c/gcc_attributes10/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int array##__LINE__[(condition) ? 1 : -1]
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 #ifdef __GNUC__
 #ifndef __clang__
diff --git a/regression/ansi-c/gcc_attributes3/main.c b/regression/ansi-c/gcc_attributes3/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 #ifdef __GNUC__
 
diff --git a/regression/ansi-c/gcc_attributes4/main.c b/regression/ansi-c/gcc_attributes4/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 #ifdef __GNUC__
 
diff --git a/regression/ansi-c/gcc_attributes5/main.c b/regression/ansi-c/gcc_attributes5/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 #ifdef __GNUC__
 
diff --git a/regression/ansi-c/gcc_attributes6/main.c b/regression/ansi-c/gcc_attributes6/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 #ifdef __GNUC__
 
diff --git a/regression/ansi-c/gcc_attributes8/main.c b/regression/ansi-c/gcc_attributes8/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 #ifdef __GNUC__
 
diff --git a/regression/ansi-c/gcc_builtins2/main.c b/regression/ansi-c/gcc_builtins2/main.c
@@ -8,7 +8,11 @@ extern double cabs (double _Complex __z);
 extern double fabs (double __x);
 extern long double cabsl (long double _Complex __z);
 
-#define STATIC_ASSERT(a) int __dummy__[(a)?1:-1]
+#  define CONCAT(a, b) a##b
+#  define CONCAT2(a, b) CONCAT(a, b)
+
+#  define STATIC_ASSERT(condition)                                             \
+    int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 #endif
 
 int main()
diff --git a/regression/ansi-c/gcc_builtins4/main.c b/regression/ansi-c/gcc_builtins4/main.c
@@ -1,6 +1,10 @@
 #ifdef __GNUC__
 
-#define STATIC_ASSERT(a) int __dummy__[(a)?1:-1]
+#  define CONCAT(a, b) a##b
+#  define CONCAT2(a, b) CONCAT(a, b)
+
+#  define STATIC_ASSERT(condition)                                             \
+    int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 struct { int i; _Bool bit_field : 1; } s;
 union { int i; } u;
diff --git a/regression/ansi-c/gcc_builtins5/main.c b/regression/ansi-c/gcc_builtins5/main.c
@@ -17,7 +17,11 @@ struct pthread
   };
 };
 
-#define STATIC_ASSERT(a) int __dummy__[(a)?1:-1]
+#  define CONCAT(a, b) a##b
+#  define CONCAT2(a, b) CONCAT(a, b)
+
+#  define STATIC_ASSERT(condition)                                             \
+    int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 int main()
 {
diff --git a/regression/ansi-c/gcc_types_compatible_p1/main.c b/regression/ansi-c/gcc_types_compatible_p1/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 int i;
 double d;
diff --git a/regression/ansi-c/gcc_types_compatible_p2/main.c b/regression/ansi-c/gcc_types_compatible_p2/main.c
@@ -1,7 +1,10 @@
 #ifdef __GNUC__
 
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1]
+#  define CONCAT(a, b) a##b
+#  define CONCAT2(a, b) CONCAT(a, b)
+
+#  define STATIC_ASSERT(condition)                                             \
+    int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 int getopt_long(int i, char * const* s);
 int getopt_long_nn(int, char * const*);
diff --git a/regression/ansi-c/gcc_types_compatible_p3/main.c b/regression/ansi-c/gcc_types_compatible_p3/main.c
@@ -1,7 +1,10 @@
 #ifdef __GNUC__
 
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1]
+#  define CONCAT(a, b) a##b
+#  define CONCAT2(a, b) CONCAT(a, b)
+
+#  define STATIC_ASSERT(condition)                                             \
+    int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 // Debian package linux-tools
 enum help_format {
diff --git a/regression/ansi-c/gcc_types_compatible_p4/main.c b/regression/ansi-c/gcc_types_compatible_p4/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 typedef struct struct_tag
 {
diff --git a/regression/ansi-c/integer_constant1/main.c b/regression/ansi-c/integer_constant1/main.c
@@ -1,5 +1,8 @@
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1];
+#define CONCAT(a, b) a##b
+#define CONCAT2(a, b) CONCAT(a, b)
+
+#define STATIC_ASSERT(condition)                                               \
+  int CONCAT2(some_array, __LINE__)[(condition) ? 1 : -1]
 
 STATIC_ASSERT('\''==39);
 STATIC_ASSERT(L'\''==39);
diff --git a/regression/ansi-c/integer_constant2/main.c b/regression/ansi-c/integer_constant2/main.c
diff --git a/regression/ansi-c/pragma_pack1/main.c b/regression/ansi-c/pragma_pack1/main.c
diff --git a/regression/ansi-c/pragma_pack2/main.c b/regression/ansi-c/pragma_pack2/main.c
diff --git a/regression/ansi-c/pragma_pack3/main.c b/regression/ansi-c/pragma_pack3/main.c
diff --git a/regression/ansi-c/sizeof1/main.c b/regression/ansi-c/sizeof1/main.c
diff --git a/regression/ansi-c/sizeof3/main.c b/regression/ansi-c/sizeof3/main.c
diff --git a/regression/ansi-c/sizeof4/main.c b/regression/ansi-c/sizeof4/main.c
diff --git a/regression/ansi-c/sizeof5/main.c b/regression/ansi-c/sizeof5/main.c
diff --git a/regression/ansi-c/struct3/main.c b/regression/ansi-c/struct3/main.c
diff --git a/regression/cbmc-with-incr/Struct_Padding1/main.c b/regression/cbmc-with-incr/Struct_Padding1/main.c
diff --git a/regression/cbmc-with-incr/null1/main.c b/regression/cbmc-with-incr/null1/main.c
diff --git a/regression/cbmc/null1/main.c b/regression/cbmc/null1/main.c
