diff options
| author | Jason Merrill <jason@redhat.com> | 2011-05-27 15:32:07 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-05-27 15:32:07 -0400 |
| commit | 6d258f3157f2e035d491929a9b819cae3b24a8e9 (patch) | |
| tree | 245de3ff34e4cbf3807e4e35e972087b8c824419 /gcc | |
| parent | 87fd3cf18a7e5d67bbbf9a96c34c5476544a4eac (diff) | |
| download | gcc-6d258f3157f2e035d491929a9b819cae3b24a8e9.zip gcc-6d258f3157f2e035d491929a9b819cae3b24a8e9.tar.gz gcc-6d258f3157f2e035d491929a9b819cae3b24a8e9.tar.bz2 | |
re PR c++/47687 ([C++0x] Crash on a lambda returning a lambda (using std::function))
PR c++/47687
* pt.c (dependent_type_p_r): Avoid infinite recursion.
From-SVN: r174354
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested4.C | 9 |
4 files changed, 23 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 19ef7ca..edc1421 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 71fe0a0..ae3d83d 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -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; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d034def..841a202 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -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. diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested4.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested4.C new file mode 100644 index 0000000..a5bd1a2 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nested4.C @@ -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; |