diff options
| -rw-r--r-- | gcc/cp/pt.cc | 12 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp1y/lambda-generic-local-class2.C | 13 |
2 files changed, 21 insertions, 4 deletions
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index c7f4a95a723..79bc9c014c8 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -4106,10 +4106,14 @@ find_parameter_packs_r (tree *tp, int *walk_subtrees, void* data) case TAG_DEFN: t = TREE_TYPE (t); if (CLASS_TYPE_P (t)) - /* Local class, need to look through the whole definition. */ - for (tree bb : BINFO_BASE_BINFOS (TYPE_BINFO (t))) - cp_walk_tree (&BINFO_TYPE (bb), &find_parameter_packs_r, - ppd, ppd->visited); + { + /* Local class, need to look through the whole definition. + TYPE_BINFO might be unset for a partial instantiation. */ + if (TYPE_BINFO (t)) + for (tree bb : BINFO_BASE_BINFOS (TYPE_BINFO (t))) + cp_walk_tree (&BINFO_TYPE (bb), &find_parameter_packs_r, + ppd, ppd->visited); + } else /* Enum, look at the values. */ for (tree l = TYPE_VALUES (t); l; l = TREE_CHAIN (l)) diff --git a/gcc/testsuite/g++.dg/cpp1y/lambda-generic-local-class2.C b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-local-class2.C new file mode 100644 index 00000000000..83856de1f41 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/lambda-generic-local-class2.C @@ -0,0 +1,13 @@ +// PR c++/109241 +// { dg-do compile { target c++14 } } +// { dg-options "" } no pedantic + +void g() { + [](auto) { + [](auto) { + ({ + struct A {}; + }); + }; + }(1); +} |