Commit 20e8fa53 by Paolo Carlini Committed by Paolo Carlini

re PR c++/58633 (ICE with decltype of destructor call)

/cp
2013-10-11  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/58633
	* parser.c (cp_parser_commit_to_topmost_tentative_parse): New.
	(cp_parser_pseudo_destructor_name): Use it.

/testsuite
2013-10-11  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/58633
	* g++.dg/cpp0x/decltype57.C: New.

From-SVN: r203448
parent acd15a28
2013-10-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58633
* parser.c (cp_parser_commit_to_topmost_tentative_parse): New.
(cp_parser_pseudo_destructor_name): Use it.
2013-10-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/31671
* pt.c (convert_nontype_argument): Set expr_type to
TREE_TYPE (probe_type).
......
......@@ -2395,6 +2395,8 @@ static void cp_parser_parse_tentatively
(cp_parser *);
static void cp_parser_commit_to_tentative_parse
(cp_parser *);
static void cp_parser_commit_to_topmost_tentative_parse
(cp_parser *);
static void cp_parser_abort_tentative_parse
(cp_parser *);
static bool cp_parser_parse_definitely
......@@ -6741,7 +6743,7 @@ cp_parser_pseudo_destructor_name (cp_parser* parser,
/* Once we see the ~, this has to be a pseudo-destructor. */
if (!processing_template_decl && !cp_parser_error_occurred (parser))
cp_parser_commit_to_tentative_parse (parser);
cp_parser_commit_to_topmost_tentative_parse (parser);
/* Look for the type-name again. We are not responsible for
checking that it matches the first type-name. */
......@@ -24449,6 +24451,32 @@ cp_parser_commit_to_tentative_parse (cp_parser* parser)
}
}
/* Commit to the topmost currently active tentative parse.
Note that this function shouldn't be called when there are
irreversible side-effects while in a tentative state. For
example, we shouldn't create a permanent entry in the symbol
table, or issue an error message that might not apply if the
tentative parse is aborted. */
static void
cp_parser_commit_to_topmost_tentative_parse (cp_parser* parser)
{
cp_parser_context *context = parser->context;
cp_lexer *lexer = parser->lexer;
if (context)
{
if (context->status == CP_PARSER_STATUS_KIND_COMMITTED)
return;
context->status = CP_PARSER_STATUS_KIND_COMMITTED;
while (!cp_lexer_saving_tokens (lexer))
lexer = lexer->next;
cp_lexer_commit_tokens (lexer);
}
}
/* Abort the currently active tentative parse. All consumed tokens
will be rolled back, and no diagnostics will be issued. */
......
2013-10-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/58633
* g++.dg/cpp0x/decltype57.C: New.
2013-10-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/31671
* g++.dg/template/nontype26.C: New.
......
// PR c++/58633
// { dg-do compile { target c++11 } }
void foo(int i)
{
typedef int I;
decltype(i.I::~I())* p;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment