Index: src/IceTypes.cpp |
diff --git a/src/IceTypes.cpp b/src/IceTypes.cpp |
index 29ff4de0799375d870be2385b40c53862dd641cd..845cae5f7b8d77ef20f51c86055dd212e848513e 100644 |
--- a/src/IceTypes.cpp |
+++ b/src/IceTypes.cpp |
@@ -41,12 +41,16 @@ void __attribute__((unused)) xIceTypeMacroIntegrityCheck() { |
}; |
// Assert that tags in ICETYPE_TABLE are also in ICETYPE_PROPS_TABLE. |
#define X(tag, size, align, elts, elty, str) \ |
- STATIC_ASSERT((unsigned)_table_tag_##tag == (unsigned)_props_table_tag_##tag); |
+ static_assert( \ |
+ (unsigned)_table_tag_##tag == (unsigned)_props_table_tag_##tag, \ |
+ "Inconsistency between ICETYPE_PROPS_TABLE and ICETYPE_TABLE"); |
ICETYPE_TABLE; |
#undef X |
// Assert that tags in ICETYPE_PROPS_TABLE is in ICETYPE_TABLE. |
#define X(tag, IsVec, IsInt, IsFloat, IsIntArith, IsLoadStore, CompareResult) \ |
- STATIC_ASSERT((unsigned)_table_tag_##tag == (unsigned)_props_table_tag_##tag); |
+ static_assert( \ |
+ (unsigned)_table_tag_##tag == (unsigned)_props_table_tag_##tag, \ |
+ "Inconsistency between ICETYPE_PROPS_TABLE and ICETYPE_TABLE"); |
ICETYPE_PROPS_TABLE |
#undef X |
@@ -69,7 +73,8 @@ void __attribute__((unused)) xIceTypeMacroIntegrityCheck() { |
}; |
// Verify that the number of vector elements is consistent with IsVec. |
#define X(tag, IsVec, IsInt, IsFloat, IsIntArith, IsLoadStore, CompareResult) \ |
- STATIC_ASSERT((_table_elts_##tag > 1) == _props_table_IsVec_##tag); |
+ static_assert((_table_elts_##tag > 1) == _props_table_IsVec_##tag, \ |
+ "Inconsistent vector specification in ICETYPE_PROPS_TABLE"); |
ICETYPE_PROPS_TABLE; |
#undef X |
} |