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

re PR c++/51908 ([C++11] ICE in cp_parser_abort_tentative_parse with decltype and variable template arguments)

Browse source 
/cp
2013-06-05  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51908
	* parser.c (cp_parser_postfix_expression [RID_*CAST]): Set
	parser->in_type_id_in_expr_p before calling cp_parser_type_id.

/testsuite
2013-06-05  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/51908
	* g++.dg/cpp0x/decltype54.C: New.

From-SVN: r199707
This commit is contained in:
Paolo Carlini 2013-06-05 17:29:21 +00:00
parent 17a7fc37d4
commit 67f0183917
4 changed files with 42 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/cp/ChangeLog
View file

@ -1,6 +1,12 @@
2013-06-05 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/51908
* parser.c (cp_parser_postfix_expression [RID_*CAST]): Set
parser->in_type_id_in_expr_p before calling cp_parser_type_id.
2013-06-03 Jan Hubicka <jh@suse.cz>
* decl2.c (maybe_make_one_only): Use forced_by_abi instad of
* decl2.c (maybe_make_one_only): Use forced_by_abi instead of
mark_decl_referenced.
(mark_needed): Likewise.

4
gcc/cp/parser.c
View file

@ -5546,6 +5546,7 @@ cp_parser_postfix_expression (cp_parser *parser, bool address_p, bool cast_p,
tree type;
tree expression;
const char *saved_message;
bool saved_in_type_id_in_expr_p;
/* All of these can be handled in the same way from the point
of view of parsing. Begin by consuming the token
@ -5560,7 +5561,10 @@ cp_parser_postfix_expression (cp_parser *parser, bool address_p, bool cast_p,
/* Look for the opening `<'. */
cp_parser_require (parser, CPP_LESS, RT_LESS);
/* Parse the type to which we are casting. */
saved_in_type_id_in_expr_p = parser->in_type_id_in_expr_p;
parser->in_type_id_in_expr_p = true;
type = cp_parser_type_id (parser);
parser->in_type_id_in_expr_p = saved_in_type_id_in_expr_p;
/* Look for the closing `>'. */
cp_parser_require (parser, CPP_GREATER, RT_GREATER);
/* Restore the old message. */

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2013-06-05 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/51908
* g++.dg/cpp0x/decltype54.C: New.
2013-06-05 James Greenhalgh <james.greenhalgh@arm.com>
* gcc.dg/fshort-wchar.c: Add extra dg-options for

26
gcc/testsuite/g++.dg/cpp0x/decltype54.C Normal file
View file

@ -0,0 +1,26 @@
// PR c++/51908
// { dg-do compile { target c++11 } }
struct foo1
{
template <typename Ret, typename... Args>
operator decltype(static_cast<Ret (*)(Args...)>(nullptr)) () const;
};
struct foo2
{
template <typename Ret, typename... Args>
operator decltype(static_cast<Ret (*)(Args... args)>(nullptr)) () const;
};
struct foo3
{
template <typename Ret, typename Arg>
operator decltype(static_cast<Ret (*)(Arg)>(nullptr)) () const;
};
struct foo4
{
template <typename Ret, typename Arg>
operator decltype(static_cast<Ret (*)(Arg arg)>(nullptr)) () const;
};