diff options
| author | Marek Polacek <polacek@redhat.com> | 2014-09-03 11:16:29 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2014-09-03 11:16:29 +0000 |
| commit | 8d95fe25c52092393ae58669bc956fab9802e390 (patch) | |
| tree | a416ed9d4087d51d053c526af41c24e59842ce38 /gcc | |
| parent | d40f3c40304c9086d7ff2c5239f58de8bc0c2218 (diff) | |
| download | gcc-8d95fe25c52092393ae58669bc956fab9802e390.zip gcc-8d95fe25c52092393ae58669bc956fab9802e390.tar.gz gcc-8d95fe25c52092393ae58669bc956fab9802e390.tar.bz2 | |
re PR c/62024 (__atomic_always_lock_free is not a constant expression)
PR c/62024
* c-parser.c (c_parser_static_assert_declaration_no_semi): Strip no-op
conversions.
* g++.dg/cpp0x/pr62024.C: New test.
* gcc.dg/pr62024.c: New test.
From-SVN: r214871
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/c/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c/c-parser.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/pr62024.C | 7 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr62024.c | 8 |
5 files changed, 29 insertions, 0 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog index 2d02c7b..af175a4 100644 --- a/gcc/c/ChangeLog +++ b/gcc/c/ChangeLog @@ -1,3 +1,9 @@ +2014-09-03 Marek Polacek <polacek@redhat.com> + + PR c/62024 + * c-parser.c (c_parser_static_assert_declaration_no_semi): Strip no-op + conversions. + 2014-09-02 Jakub Jelinek <jakub@redhat.com> Balaji V. Iyer <balaji.v.iyer@intel.com> Igor Zamyatin <igor.zamyatin@intel.com> diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c index 03c6830..3f4a92b 100644 --- a/gcc/c/c-parser.c +++ b/gcc/c/c-parser.c @@ -2060,6 +2060,8 @@ c_parser_static_assert_declaration_no_semi (c_parser *parser) if (TREE_CODE (value) != INTEGER_CST) { value = c_fully_fold (value, false, NULL); + /* Strip no-op conversions. */ + STRIP_TYPE_NOPS (value); if (TREE_CODE (value) == INTEGER_CST) pedwarn (value_loc, OPT_Wpedantic, "expression in static assertion " "is not an integer constant expression"); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4065e49..5d1cf61 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-09-03 Marek Polacek <polacek@redhat.com> + + PR c/62024 + * g++.dg/cpp0x/pr62024.C: New test. + * gcc.dg/pr62024.c: New test. + 2014-09-03 Ilya Tocar <ilya.tocar@intel.com> * gcc.target/i386/adx-addcarryx32-1.c: Test addcarry, subborrow. diff --git a/gcc/testsuite/g++.dg/cpp0x/pr62024.C b/gcc/testsuite/g++.dg/cpp0x/pr62024.C new file mode 100644 index 0000000..5f0640a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr62024.C @@ -0,0 +1,7 @@ +// PR c/62024 +// { dg-do compile { target c++11 } } +// { dg-require-effective-target sync_char_short } + +int *p; +static_assert (__atomic_always_lock_free (1, p), ""); +static_assert (__atomic_always_lock_free (1, 0), ""); diff --git a/gcc/testsuite/gcc.dg/pr62024.c b/gcc/testsuite/gcc.dg/pr62024.c new file mode 100644 index 0000000..79a0b79 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr62024.c @@ -0,0 +1,8 @@ +/* PR c/62024 */ +/* { dg-do compile } */ +/* { dg-options "-std=gnu11 -Wpedantic" } */ +/* { dg-require-effective-target sync_char_short } */ + +int *p; +_Static_assert (__atomic_always_lock_free (1, p), ""); /* { dg-warning "is not an integer constant" } */ +_Static_assert (__atomic_always_lock_free (1, 0), ""); /* { dg-warning "is not an integer constant" } */ |