From 1bcc5f29a71797dea523d8750dfb75a2b36920b3 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 6 Aug 2015 12:33:14 -0400 Subject: re PR c++/66533 ([C++14] ICE: in dependent_type_p, at cp/pt.c:21073) PR c++/66533 * parser.c (cp_parser_primary_expression): Don't skip to the end of the statement if we're parsing tentatively. From-SVN: r226684 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/parser.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e8d45dc..946c2c2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2015-08-06 Jason Merrill + PR c++/66533 + * parser.c (cp_parser_primary_expression): Don't skip to the end + of the statement if we're parsing tentatively. + PR c++/67130 PR c++/67131 PR c++/66260 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index b978fcf..bfad608 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -4432,7 +4432,8 @@ cp_parser_primary_expression (cp_parser *parser, parser->greater_than_is_operator_p = saved_greater_than_is_operator_p; /* Consume the `)'. */ - if (!cp_parser_require (parser, CPP_CLOSE_PAREN, RT_CLOSE_PAREN)) + if (!cp_parser_require (parser, CPP_CLOSE_PAREN, RT_CLOSE_PAREN) + && !cp_parser_uncommitted_to_tentative_parse_p (parser)) cp_parser_skip_to_end_of_statement (parser); return expr; -- cgit v1.1