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

re PR c++/44366 ([C++0x] g++ crashes when declaring a lambda expression using a typedef'd decltype.)

Browse source 
PR c++/44366
	* error.c (dump_parameters): Mask out TFF_SCOPE.
	(dump_simple_decl): Don't print the scope of a PARM_DECL.
	(dump_scope): Remove no-op mask.

From-SVN: r160420
This commit is contained in:
Jason Merrill 2010-06-08 00:33:50 -04:00 • committed by Jason Merrill
parent 49c8958b58
commit af88c58fb8
4 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcc/cp/ChangeLog
View file

@ -1,5 +1,10 @@
2010-06-07 Jason Merrill <jason@redhat.com>
PR c++/44366
* error.c (dump_parameters): Mask out TFF_SCOPE.
(dump_simple_decl): Don't print the scope of a PARM_DECL.
(dump_scope): Remove no-op mask.
PR c++/44401
* parser.c (cp_parser_lookup_name): Fix naming the constructor.

4
gcc/cp/error.c
View file

@ -115,7 +115,7 @@ init_error (void)
static void
dump_scope (tree scope, int flags)
{
int f = ~TFF_RETURN_TYPE & (flags & (TFF_SCOPE | TFF_CHASE_TYPEDEF));
int f = flags & (TFF_SCOPE | TFF_CHASE_TYPEDEF);
if (scope == NULL_TREE)
return;
@ -865,6 +865,7 @@ dump_simple_decl (tree t, tree type, int flags)
pp_maybe_space (cxx_pp);
}
if (! (flags & TFF_UNQUALIFIED_NAME)
&& TREE_CODE (t) != PARM_DECL
&& (!DECL_INITIAL (t)
|| TREE_CODE (DECL_INITIAL (t)) != TEMPLATE_PARM_INDEX))
dump_scope (CP_DECL_CONTEXT (t), flags);
@ -1355,6 +1356,7 @@ static void
dump_parameters (tree parmtypes, int flags)
{
int first = 1;
flags &= ~TFF_SCOPE;
pp_cxx_left_paren (cxx_pp);
for (first = 1; parmtypes != void_list_node;

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2010-06-07 Jason Merrill <jason@redhat.com>
PR c++/44366
* g++.dg/cpp0x/decltype23.C: New.
2010-06-08 Andrew Pinski <pinskia@gmail.com>
Shujing Zhao <pearly.zhao@oracle.com>

12
gcc/testsuite/g++.dg/cpp0x/decltype23.C Normal file
View file

@ -0,0 +1,12 @@
// PR c++/44366
// While printing the operand of decltype We were trying to print f as the
// scope of t, causing infinite recursion.
// { dg-options "-std=c++0x" }
template <typename T>
void f(T t, decltype(*t))
{
struct A { void g() {
foo; // { dg-error "foo" }
} };
}