aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/parser.c
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2020-10-26 15:04:58 -0400
committerMarek Polacek <polacek@redhat.com>2020-10-28 15:22:05 -0400
commit43cb72263fb3b7b97a74fb38d71364a1d5cf0448 (patch)
tree04c0f4d0fe1c02187a38ecb7de2d68369377075c /gcc/cp/parser.c
parentdfbadb8ce9f4a7278121ab92bf77bde0c1d3b641 (diff)
downloadgcc-43cb72263fb3b7b97a74fb38d71364a1d5cf0448.zip
gcc-43cb72263fb3b7b97a74fb38d71364a1d5cf0448.tar.gz
gcc-43cb72263fb3b7b97a74fb38d71364a1d5cf0448.tar.bz2
c++: GCC accepts junk before fold-expression [PR86773]
Here we accept a bogus expression before a left fold: Recall that a fold expression looks like: fold-expression: ( cast-expression fold-operator ... ) ( ... fold-operator cast-expression ) ( cast-expression fold-operator ... fold-operator cast-expression ) but here we have ( cast-expression ... fold-operator cast-expression ) The best fix seems to just return error_mark_node when we know this code is invalid, and let the subsequent code report that a ) was expected. gcc/cp/ChangeLog: PR c++/86773 * parser.c (cp_parser_fold_expression): Return error_mark_node if a left fold is preceded by an expression. gcc/testsuite/ChangeLog: PR c++/86773 * g++.dg/cpp1z/fold12.C: New test.
Diffstat (limited to 'gcc/cp/parser.c')
-rw-r--r--gcc/cp/parser.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 52637b1..80d903c 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -5138,6 +5138,8 @@ cp_parser_fold_expression (cp_parser *parser, tree expr1)
// Left fold.
if (cp_lexer_next_token_is (parser->lexer, CPP_ELLIPSIS))
{
+ if (expr1)
+ return error_mark_node;
cp_lexer_consume_token (parser->lexer);
int op = cp_parser_fold_operator (parser);
if (op == ERROR_MARK)