aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/parser.c
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2016-11-17 16:40:41 -0500
committerJason Merrill <jason@gcc.gnu.org>2016-11-17 16:40:41 -0500
commitd168b3daa6f5aad0f5d57b9ac814dcd6e8243c61 (patch)
tree56646e223299a79082b059fd82e40ca294c9e3a5 /gcc/cp/parser.c
parent77b384c53f2229b05513fb4b297d4c93da04f01a (diff)
downloadgcc-d168b3daa6f5aad0f5d57b9ac814dcd6e8243c61.zip
gcc-d168b3daa6f5aad0f5d57b9ac814dcd6e8243c61.tar.gz
gcc-d168b3daa6f5aad0f5d57b9ac814dcd6e8243c61.tar.bz2
PR c++/68377 - parenthesized expr in fold-expression
* parser.c (cp_parser_fold_expression): Check TREE_NO_WARNING. From-SVN: r242561
Diffstat (limited to 'gcc/cp/parser.c')
-rw-r--r--gcc/cp/parser.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 9a5039f..3ab0b68 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -4679,7 +4679,9 @@ cp_parser_fold_expression (cp_parser *parser, tree expr1)
/* The operands of a fold-expression are cast-expressions, so binary or
conditional expressions are not allowed. We check this here to avoid
tentative parsing. */
- if (is_binary_op (TREE_CODE (expr1)))
+ if (EXPR_P (expr1) && TREE_NO_WARNING (expr1))
+ /* OK, the expression was parenthesized. */;
+ else if (is_binary_op (TREE_CODE (expr1)))
error_at (location_of (expr1),
"binary expression in operand of fold-expression");
else if (TREE_CODE (expr1) == COND_EXPR)