FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
/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
This commit is contained in:
Paolo Carlini 2013-10-11 14:35:23 +00:00 • committed by Paolo Carlini
parent acd15a286e
commit 20e8fa5327
4 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,3 +1,9 @@
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

30
gcc/cp/parser.c
View file

@ -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. */

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
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

8
gcc/testsuite/g++.dg/cpp0x/decltype57.C Normal file
View file

@ -0,0 +1,8 @@
// PR c++/58633
// { dg-do compile { target c++11 } }
void foo(int i)
{
typedef int I;
decltype(i.I::~I())* p;
}