Subzero: Move to C++11 static_assert().

src/IceTargetLoweringX8632.cpp

Index: src/IceTargetLoweringX8632.cpp
diff --git a/src/IceTargetLoweringX8632.cpp b/src/IceTargetLoweringX8632.cpp
index b9d3170d2182e41a5fd847af566f7f52ee0fddb2..d4d9c858d5f96d386115ad8060747b66a7278688 100644
--- a/src/IceTargetLoweringX8632.cpp
+++ b/src/IceTargetLoweringX8632.cpp
@@ -189,12 +189,17 @@ void __attribute__((unused)) xMacroIntegrityCheck() {
 // and ensure the table entry keys are consistent.
 #define X(val, dflt, swapS, C1, C2, swapV, pred)                               \
   static const int _table2_##val = _tmp_##val;                                 \
-  STATIC_ASSERT(_table1_##val == _table2_##val);
+  static_assert(                                                               \
+      _table1_##val == _table2_##val,                                          \
+      "Inconsistency between FCMPX8632_TABLE and ICEINSTFCMP_TABLE");
     FCMPX8632_TABLE;
 #undef X
 // Repeat the static asserts with respect to the high-level
 // table entries in case the high-level table has extra entries.
-#define X(tag, str) STATIC_ASSERT(_table1_##tag == _table2_##tag);
+#define X(tag, str)                                                            \
+  static_assert(                                                               \
+      _table1_##tag == _table2_##tag,                                          \
+      "Inconsistency between FCMPX8632_TABLE and ICEINSTFCMP_TABLE");
     ICEINSTFCMP_TABLE;
 #undef X
   }
@@ -217,12 +222,17 @@ void __attribute__((unused)) xMacroIntegrityCheck() {
 // and ensure the table entry keys are consistent.
 #define X(val, C_32, C1_64, C2_64, C3_64)                                      \
   static const int _table2_##val = _tmp_##val;                                 \
-  STATIC_ASSERT(_table1_##val == _table2_##val);
+  static_assert(                                                               \
+      _table1_##val == _table2_##val,                                          \
+      "Inconsistency between ICMPX8632_TABLE and ICEINSTICMP_TABLE");
     ICMPX8632_TABLE;
 #undef X
 // Repeat the static asserts with respect to the high-level
 // table entries in case the high-level table has extra entries.
-#define X(tag, str) STATIC_ASSERT(_table1_##tag == _table2_##tag);
+#define X(tag, str)                                                            \
+  static_assert(                                                               \
+      _table1_##tag == _table2_##tag,                                          \
+      "Inconsistency between ICMPX8632_TABLE and ICEINSTICMP_TABLE");
     ICEINSTICMP_TABLE;
 #undef X
   }
@@ -246,13 +256,15 @@ void __attribute__((unused)) xMacroIntegrityCheck() {
 // and ensure the table entry keys are consistent.
 #define X(tag, elementty, cvt, sdss, pack, width)                              \
   static const int _table2_##tag = _tmp_##tag;                                 \
-  STATIC_ASSERT(_table1_##tag == _table2_##tag);
+  static_assert(_table1_##tag == _table2_##tag,                                \
+                "Inconsistency between ICETYPEX8632_TABLE and ICETYPE_TABLE");
     ICETYPEX8632_TABLE;
 #undef X
 // Repeat the static asserts with respect to the high-level
 // table entries in case the high-level table has extra entries.
 #define X(tag, size, align, elts, elty, str)                                   \
-  STATIC_ASSERT(_table1_##tag == _table2_##tag);
+  static_assert(_table1_##tag == _table2_##tag,                                \
+                "Inconsistency between ICETYPEX8632_TABLE and ICETYPE_TABLE");
     ICETYPE_TABLE;
 #undef X
   }