Commit af88c58f by Jason Merrill Committed by Jason Merrill

re PR c++/44366 ([C++0x] g++ crashes when declaring a lambda expression using a…

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

	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
parent 49c8958b
2010-06-07 Jason Merrill <jason@redhat.com> 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 PR c++/44401
* parser.c (cp_parser_lookup_name): Fix naming the constructor. * parser.c (cp_parser_lookup_name): Fix naming the constructor.
......
...@@ -115,7 +115,7 @@ init_error (void) ...@@ -115,7 +115,7 @@ init_error (void)
static void static void
dump_scope (tree scope, int flags) 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) if (scope == NULL_TREE)
return; return;
...@@ -865,6 +865,7 @@ dump_simple_decl (tree t, tree type, int flags) ...@@ -865,6 +865,7 @@ dump_simple_decl (tree t, tree type, int flags)
pp_maybe_space (cxx_pp); pp_maybe_space (cxx_pp);
} }
if (! (flags & TFF_UNQUALIFIED_NAME) if (! (flags & TFF_UNQUALIFIED_NAME)
&& TREE_CODE (t) != PARM_DECL
&& (!DECL_INITIAL (t) && (!DECL_INITIAL (t)
|| TREE_CODE (DECL_INITIAL (t)) != TEMPLATE_PARM_INDEX)) || TREE_CODE (DECL_INITIAL (t)) != TEMPLATE_PARM_INDEX))
dump_scope (CP_DECL_CONTEXT (t), flags); dump_scope (CP_DECL_CONTEXT (t), flags);
...@@ -1355,6 +1356,7 @@ static void ...@@ -1355,6 +1356,7 @@ static void
dump_parameters (tree parmtypes, int flags) dump_parameters (tree parmtypes, int flags)
{ {
int first = 1; int first = 1;
flags &= ~TFF_SCOPE;
pp_cxx_left_paren (cxx_pp); pp_cxx_left_paren (cxx_pp);
for (first = 1; parmtypes != void_list_node; for (first = 1; parmtypes != void_list_node;
......
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> 2010-06-08 Andrew Pinski <pinskia@gmail.com>
Shujing Zhao <pearly.zhao@oracle.com> Shujing Zhao <pearly.zhao@oracle.com>
......
// 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" }
} };
}
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