From c757ad4cf61f982a05cb5f424308ec199aa2923d Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Thu, 16 Nov 2017 12:11:36 +0000 Subject: [PATCH] [PR c++/81060] ICE with invalid initialzer via lambda https://gcc.gnu.org/ml/gcc-patches/2017-11/msg01323.html PR c++/81060 * decl.c (xref_tag_1): Push lambda into current scope. * name-lookup.c (do_pushtag): Don't deal with ts_lambda here. PR c++81060 * g++.dg/cpp0x/lambda/lambda-template13.C: Avoid undefined template using local type error. * g++.dg/cpp0x/pr81060.C: New. From-SVN: r254817 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/decl.c | 8 ++++++-- gcc/cp/name-lookup.c | 6 +----- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template13.C | 2 +- gcc/testsuite/g++.dg/cpp0x/pr81060.C | 11 +++++++++++ 6 files changed, 32 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/pr81060.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index e8c882f2253..31de2a66182 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2017-11-16 Nathan Sidwell + + PR c++/81060 + * decl.c (xref_tag_1): Push lambda into current scope. + * name-lookup.c (do_pushtag): Don't deal with ts_lambda here. + 2017-11-15 Nathan Sidwell PR c++/81574 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 7e16f7b415b..54e06568e46 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -13546,8 +13546,12 @@ xref_tag_1 (enum tag_types tag_code, tree name, t = make_class_type (code); TYPE_CONTEXT (t) = context; if (scope == ts_lambda) - /* Mark it as a lambda type. */ - CLASSTYPE_LAMBDA_EXPR (t) = error_mark_node; + { + /* Mark it as a lambda type. */ + CLASSTYPE_LAMBDA_EXPR (t) = error_mark_node; + /* And push it into current scope. */ + scope = ts_current; + } t = pushtag (name, t, scope); } } diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index b4976d8b7cc..e9d44e4a594 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -6242,9 +6242,7 @@ do_pushtag (tree name, tree type, tag_scope scope) view of the language. */ || (b->kind == sk_template_parms && (b->explicit_spec_p || scope == ts_global)) - /* Pushing into a class is ok for lambdas or when we want current */ || (b->kind == sk_class - && scope != ts_lambda && (scope != ts_current /* We may be defining a new type in the initializer of a static member variable. We allow this when @@ -6267,7 +6265,6 @@ do_pushtag (tree name, tree type, tag_scope scope) tree cs = current_scope (); if (scope == ts_current - || scope == ts_lambda || (cs && TREE_CODE (cs) == FUNCTION_DECL)) context = cs; else if (cs && TYPE_P (cs)) @@ -6304,8 +6301,7 @@ do_pushtag (tree name, tree type, tag_scope scope) if (b->kind == sk_class) { - if (!TYPE_BEING_DEFINED (current_class_type) - && scope != ts_lambda) + if (!TYPE_BEING_DEFINED (current_class_type)) return error_mark_node; if (!PROCESSING_REAL_TEMPLATE_DECL_P ()) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 57bdc1c5ccc..36a8449a815 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2017-11-16 Nathan Sidwell + + PR c++81060 + * g++.dg/cpp0x/lambda/lambda-template13.C: Avoid undefined + template using local type error. + * g++.dg/cpp0x/pr81060.C: New. + 2017-11-16 Wilco Dijkstra Jackson Woodruff diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template13.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template13.C index 01fe3f66cf4..8aaf5b2800f 100644 --- a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template13.C +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-template13.C @@ -4,7 +4,7 @@ struct function { template < typename _Functor> - function (_Functor); + function (_Functor) {} }; template diff --git a/gcc/testsuite/g++.dg/cpp0x/pr81060.C b/gcc/testsuite/g++.dg/cpp0x/pr81060.C new file mode 100644 index 00000000000..67b2b38596a --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/pr81060.C @@ -0,0 +1,11 @@ +// { dg-do compile { target c++11 } } +// PR 81050 ICE in invalid after error + +template struct A +{ + static const int i; +}; + +template +const int A::i // { dg-error "template definition of non-template" } += []{ return 0; }(); // BOOM! -- 2.30.2