Skip to content

S
swiftshader
Commit 8427ea2b by JF Bastien
Options

Fix pedantic build warnings;

GCC 4.8.1 is sad; There are extra semicolons in Subzero; It removes the semicolons or it gets the build warning hose again;^H R=stichnot@chromium.org BUG= none Review URL: https://codereview.chromium.org/882743003
parent dd842dbb
Showing with 12 additions and 12 deletions
src/IceTLS.h
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
static int FieldName##__initStatus static int FieldName##__initStatus
#define ICE_TLS_DEFINE_FIELD(Type, ClassName, FieldName) \ #define ICE_TLS_DEFINE_FIELD(Type, ClassName, FieldName) \
pthread_key_t ClassName::FieldName##__key; \ pthread_key_t ClassName::FieldName##__key; \
int ClassName::FieldName##__initStatus = 1; int ClassName::FieldName##__initStatus = 1
#define ICE_TLS_INIT_FIELD(FieldName) \ #define ICE_TLS_INIT_FIELD(FieldName) \
if (FieldName##__initStatus) { \ if (FieldName##__initStatus) { \
FieldName##__initStatus = pthread_key_create(&FieldName##__key, nullptr); \ FieldName##__initStatus = pthread_key_create(&FieldName##__key, nullptr); \
......
src/IceTargetLoweringX8632.cpp
...@@ -183,7 +183,7 @@ enum _tmp_enum { ...@@ -183,7 +183,7 @@ enum _tmp_enum {
}; };
// Define a set of constants based on high-level table entries. // Define a set of constants based on high-level table entries.
#define X(tag, str) static const int _table1_##tag = InstFcmp::tag; #define X(tag, str) static const int _table1_##tag = InstFcmp::tag;
ICEINSTFCMP_TABLE; ICEINSTFCMP_TABLE
#undef X #undef X
// Define a set of constants based on low-level table entries, and // Define a set of constants based on low-level table entries, and
// ensure the table entry keys are consistent. // ensure the table entry keys are consistent.
...@@ -192,7 +192,7 @@ ICEINSTFCMP_TABLE; ...@@ -192,7 +192,7 @@ ICEINSTFCMP_TABLE;
static_assert( \ static_assert( \
_table1_##val == _table2_##val, \ _table1_##val == _table2_##val, \
"Inconsistency between FCMPX8632_TABLE and ICEINSTFCMP_TABLE"); "Inconsistency between FCMPX8632_TABLE and ICEINSTFCMP_TABLE");
FCMPX8632_TABLE; FCMPX8632_TABLE
#undef X #undef X
// Repeat the static asserts with respect to the high-level table // Repeat the static asserts with respect to the high-level table
// entries in case the high-level table has extra entries. // entries in case the high-level table has extra entries.
...@@ -200,7 +200,7 @@ FCMPX8632_TABLE; ...@@ -200,7 +200,7 @@ FCMPX8632_TABLE;
static_assert( \ static_assert( \
_table1_##tag == _table2_##tag, \ _table1_##tag == _table2_##tag, \
"Inconsistency between FCMPX8632_TABLE and ICEINSTFCMP_TABLE"); "Inconsistency between FCMPX8632_TABLE and ICEINSTFCMP_TABLE");
ICEINSTFCMP_TABLE; ICEINSTFCMP_TABLE
#undef X #undef X
} // end of namespace dummy1 } // end of namespace dummy1
...@@ -216,7 +216,7 @@ enum _tmp_enum { ...@@ -216,7 +216,7 @@ enum _tmp_enum {
}; };
// Define a set of constants based on high-level table entries. // Define a set of constants based on high-level table entries.
#define X(tag, str) static const int _table1_##tag = InstIcmp::tag; #define X(tag, str) static const int _table1_##tag = InstIcmp::tag;
ICEINSTICMP_TABLE; ICEINSTICMP_TABLE
#undef X #undef X
// Define a set of constants based on low-level table entries, and // Define a set of constants based on low-level table entries, and
// ensure the table entry keys are consistent. // ensure the table entry keys are consistent.
...@@ -225,7 +225,7 @@ ICEINSTICMP_TABLE; ...@@ -225,7 +225,7 @@ ICEINSTICMP_TABLE;
static_assert( \ static_assert( \
_table1_##val == _table2_##val, \ _table1_##val == _table2_##val, \
"Inconsistency between ICMPX8632_TABLE and ICEINSTICMP_TABLE"); "Inconsistency between ICMPX8632_TABLE and ICEINSTICMP_TABLE");
ICMPX8632_TABLE; ICMPX8632_TABLE
#undef X #undef X
// Repeat the static asserts with respect to the high-level table // Repeat the static asserts with respect to the high-level table
// entries in case the high-level table has extra entries. // entries in case the high-level table has extra entries.
...@@ -233,7 +233,7 @@ ICMPX8632_TABLE; ...@@ -233,7 +233,7 @@ ICMPX8632_TABLE;
static_assert( \ static_assert( \
_table1_##tag == _table2_##tag, \ _table1_##tag == _table2_##tag, \
"Inconsistency between ICMPX8632_TABLE and ICEINSTICMP_TABLE"); "Inconsistency between ICMPX8632_TABLE and ICEINSTICMP_TABLE");
ICEINSTICMP_TABLE; ICEINSTICMP_TABLE
#undef X #undef X
} // end of namespace dummy2 } // end of namespace dummy2
...@@ -250,7 +250,7 @@ enum _tmp_enum { ...@@ -250,7 +250,7 @@ enum _tmp_enum {
// Define a set of constants based on high-level table entries. // Define a set of constants based on high-level table entries.
#define X(tag, size, align, elts, elty, str) \ #define X(tag, size, align, elts, elty, str) \
static const int _table1_##tag = tag; static const int _table1_##tag = tag;
ICETYPE_TABLE; ICETYPE_TABLE
#undef X #undef X
// Define a set of constants based on low-level table entries, and // Define a set of constants based on low-level table entries, and
// ensure the table entry keys are consistent. // ensure the table entry keys are consistent.
...@@ -258,14 +258,14 @@ ICETYPE_TABLE; ...@@ -258,14 +258,14 @@ ICETYPE_TABLE;
static const int _table2_##tag = _tmp_##tag; \ 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"); "Inconsistency between ICETYPEX8632_TABLE and ICETYPE_TABLE");
ICETYPEX8632_TABLE; ICETYPEX8632_TABLE
#undef X #undef X
// Repeat the static asserts with respect to the high-level table // Repeat the static asserts with respect to the high-level table
// entries in case the high-level table has extra entries. // entries in case the high-level table has extra entries.
#define X(tag, size, align, elts, elty, str) \ #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"); "Inconsistency between ICETYPEX8632_TABLE and ICETYPE_TABLE");
ICETYPE_TABLE; ICETYPE_TABLE
#undef X #undef X
} // end of namespace dummy3 } // end of namespace dummy3
......
src/IceTypes.cpp
...@@ -46,7 +46,7 @@ enum { ...@@ -46,7 +46,7 @@ enum {
static_assert( \ static_assert( \
(unsigned)_table_tag_##tag == (unsigned)_props_table_tag_##tag, \ (unsigned)_table_tag_##tag == (unsigned)_props_table_tag_##tag, \
"Inconsistency between ICETYPE_PROPS_TABLE and ICETYPE_TABLE"); "Inconsistency between ICETYPE_PROPS_TABLE and ICETYPE_TABLE");
ICETYPE_TABLE; ICETYPE_TABLE
#undef X #undef X
// Assert that tags in ICETYPE_PROPS_TABLE is in ICETYPE_TABLE. // Assert that tags in ICETYPE_PROPS_TABLE is in ICETYPE_TABLE.
#define X(tag, IsVec, IsInt, IsFloat, IsIntArith, IsLoadStore, CompareResult) \ #define X(tag, IsVec, IsInt, IsFloat, IsIntArith, IsLoadStore, CompareResult) \
...@@ -77,7 +77,7 @@ enum { ...@@ -77,7 +77,7 @@ enum {
#define X(tag, IsVec, IsInt, IsFloat, IsIntArith, IsLoadStore, CompareResult) \ #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"); "Inconsistent vector specification in ICETYPE_PROPS_TABLE");
ICETYPE_PROPS_TABLE; ICETYPE_PROPS_TABLE
#undef X #undef X
struct TypeAttributeFields { struct TypeAttributeFields {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment