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

re PR c++/47687 ([C++0x] Crash on a lambda returning a lambda (using std::function))

Browse source 
PR c++/47687
	* pt.c (dependent_type_p_r): Avoid infinite recursion.

From-SVN: r174354
This commit is contained in:
Jason Merrill 2011-05-27 15:32:07 -04:00 • committed by Jason Merrill
parent 87fd3cf18a
commit 6d258f3157
4 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gcc/cp/ChangeLog
View file

@ -1,5 +1,8 @@
2011-05-27 Jason Merrill <jason@redhat.com>
PR c++/47687
* pt.c (dependent_type_p_r): Avoid infinite recursion.
PR c++/48284
* error.c (dump_expr) [COMPONENT_REF]: Use pp_cxx_dot
with INDIRECT_REF of REFERENCE_TYPE.

11
gcc/cp/pt.c
View file

@ -18260,8 +18260,15 @@ dependent_type_p_r (tree type)
scope = TYPE_CONTEXT (type);
if (scope && TYPE_P (scope))
return dependent_type_p (scope);
else if (scope && TREE_CODE (scope) == FUNCTION_DECL)
return type_dependent_expression_p (scope);
/* Don't use type_dependent_expression_p here, as it can lead
to infinite recursion trying to determine whether a lambda
nested in a lambda is dependent (c++/47687). */
else if (scope && TREE_CODE (scope) == FUNCTION_DECL
&& DECL_LANG_SPECIFIC (scope)
&& DECL_TEMPLATE_INFO (scope)
&& (any_dependent_template_arguments_p
(INNERMOST_TEMPLATE_ARGS (DECL_TI_ARGS (scope)))))
return true;
/* Other types are non-dependent. */
return false;

2
gcc/testsuite/ChangeLog
View file

@ -1,5 +1,7 @@
2011-05-27 Jason Merrill <jason@redhat.com>
* g++.dg/cpp0x/lambda/lambda-nested4.C: New.
* g++.dg/cpp0x/error6.C: New.
* g++.dg/cpp0x/error5.C: New.

9
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested4.C Normal file
View file

@ -0,0 +1,9 @@
// PR c++/47687
// { dg-options -std=c++0x }
template <class T> struct A { };
auto inl = []{ return []{}; }();
typedef decltype(inl) inlt;
A<inlt> a;