From 8d95fe25c52092393ae58669bc956fab9802e390 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Wed, 3 Sep 2014 11:16:29 +0000 Subject: 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 --- gcc/c/ChangeLog | 6 ++++++ gcc/c/c-parser.c | 2 ++ 2 files changed, 8 insertions(+) (limited to 'gcc/c') 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 + + PR c/62024 + * c-parser.c (c_parser_static_assert_declaration_no_semi): Strip no-op + conversions. + 2014-09-02 Jakub Jelinek Balaji V. Iyer Igor Zamyatin 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"); -- cgit v1.1