diff options
| author | Patrick Palka <ppalka@gcc.gnu.org> | 2016-03-05 01:59:04 +0000 |
|---|---|---|
| committer | Patrick Palka <ppalka@gcc.gnu.org> | 2016-03-05 01:59:04 +0000 |
| commit | 7a3a3fadb050d9e49b18d052cfc20191acdf4126 (patch) | |
| tree | 254c9fbf70248291f4be405898f6b1b4c374240f /gcc | |
| parent | b554db5b0390f394bf9b8269c0398da9c8a3cbdb (diff) | |
| download | gcc-7a3a3fadb050d9e49b18d052cfc20191acdf4126.zip gcc-7a3a3fadb050d9e49b18d052cfc20191acdf4126.tar.gz gcc-7a3a3fadb050d9e49b18d052cfc20191acdf4126.tar.bz2 | |
Fix PR c++/66786 (ICE with nested lambdas in variable template)
gcc/cp/ChangeLog:
PR c++/66786
* pt.c (template_class_depth): Given a lambda type, iterate
into its LAMBDA_TYPE_EXTRA_SCOPE field instead of its
TYPE_CONTEXT. Given a VAR_DECL, iterate into its
CP_DECL_CONTEXT.
gcc/testsuite/ChangeLog:
PR c++/66786
* g++.dg/cpp1y/var-templ48.C: New test.
* g++.dg/cpp1y/var-templ49.C: New test.
From-SVN: r233997
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 12 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/var-templ48.C | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/var-templ49.C | 9 |
5 files changed, 36 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f4c8744..0ef1ac7 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2016-03-05 Patrick Palka <ppalka@gcc.gnu.org> + + PR c++/66786 + * pt.c (template_class_depth): Given a lambda type, iterate + into its LAMBDA_TYPE_EXTRA_SCOPE field instead of its + TYPE_CONTEXT. Given a VAR_DECL, iterate into its + CP_DECL_CONTEXT. + 2016-03-04 Jason Merrill <jason@redhat.com> PR c++/69203 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index e8cd736..f6dd75a 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -370,16 +370,20 @@ template_class_depth (tree type) { int depth; - for (depth = 0; - type && TREE_CODE (type) != NAMESPACE_DECL; - type = (TREE_CODE (type) == FUNCTION_DECL) - ? CP_DECL_CONTEXT (type) : CP_TYPE_CONTEXT (type)) + for (depth = 0; type && TREE_CODE (type) != NAMESPACE_DECL; ) { tree tinfo = get_template_info (type); if (tinfo && PRIMARY_TEMPLATE_P (TI_TEMPLATE (tinfo)) && uses_template_parms (INNERMOST_TEMPLATE_ARGS (TI_ARGS (tinfo)))) ++depth; + + if (VAR_OR_FUNCTION_DECL_P (type)) + type = CP_DECL_CONTEXT (type); + else if (LAMBDA_TYPE_P (type)) + type = LAMBDA_TYPE_EXTRA_SCOPE (type); + else + type = CP_TYPE_CONTEXT (type); } return depth; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 03ee529..ca65abf 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-03-05 Patrick Palka <ppalka@gcc.gnu.org> + + PR c++/66786 + * g++.dg/cpp1y/var-templ48.C: New test. + * g++.dg/cpp1y/var-templ49.C: New test. + 2016-03-04 Eric Botcazou <ebotcazou@adacore.com> * g++.dg/Wno-frame-address.C: Skip on IA-64. diff --git a/gcc/testsuite/g++.dg/cpp1y/var-templ48.C b/gcc/testsuite/g++.dg/cpp1y/var-templ48.C new file mode 100644 index 0000000..f0c7693 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/var-templ48.C @@ -0,0 +1,5 @@ +// PR c++/66786 +// { dg-do compile { target c++14 } } + +template <typename... T> auto list = [](T... xs) { [=](auto f) { f(xs...); }; }; +int main() { list<int>(0); } diff --git a/gcc/testsuite/g++.dg/cpp1y/var-templ49.C b/gcc/testsuite/g++.dg/cpp1y/var-templ49.C new file mode 100644 index 0000000..7ac5744 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/var-templ49.C @@ -0,0 +1,9 @@ +// PR c++/66786 +// { dg-do compile { target c++14 } } + +int f (int, bool); + +template <typename> +auto list = [](auto... xs) { return [=](auto f, auto... ys) { return f(xs..., ys...); }; }; + +const int &a = list<int>(0)(f, true); |