From f370e66bb8c7fe4b8fe694dd79f13e834b4e7575 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 5 Nov 2007 09:18:03 +0100 Subject: re PR c++/33836 (ICE with invalid use of &&) PR c++/33836 * parser.c (cp_parser_unary_expression): For &&label call cp_parser_non_integral_constant_expression and return error_mark_node if it returned true. * g++.dg/ext/label10.C: New test. From-SVN: r129896 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/parser.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'gcc/cp') diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5eb1dce..7869765 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2007-11-05 Jakub Jelinek + PR c++/33836 + * parser.c (cp_parser_unary_expression): For &&label call + cp_parser_non_integral_constant_expression and return error_mark_node + if it returned true. + PR c++/33969 * decl.c (grokdeclarator): Don't call build_memfn_type if type is neither FUNCTION_TYPE nor METHOD_TYPE. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 0772c87..4729d1e 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -5329,13 +5329,18 @@ cp_parser_unary_expression (cp_parser *parser, bool address_p, bool cast_p) && token->type == CPP_AND_AND) { tree identifier; + tree expression; /* Consume the '&&' token. */ cp_lexer_consume_token (parser->lexer); /* Look for the identifier. */ identifier = cp_parser_identifier (parser); /* Create an expression representing the address. */ - return finish_label_address_expr (identifier); + expression = finish_label_address_expr (identifier); + if (cp_parser_non_integral_constant_expression (parser, + "the address of a label")) + expression = error_mark_node; + return expression; } } if (unary_operator != ERROR_MARK) -- cgit v1.1