From 5aeb734800f9bcf6216458eb39a1efa8b85fea1e Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 19 Nov 2012 09:05:36 -0500 Subject: [PATCH] re PR c++/55261 ([C++0x] ICE (SIGSEGV) when inheriting implicit constructor) PR c++/55261 * class.c (add_implicitly_declared_members): Use lookup_fnfields_slot to get the base constructors. From-SVN: r193621 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/class.c | 3 ++- gcc/testsuite/g++.dg/cpp0x/inh-ctor14.C | 10 ++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/inh-ctor14.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a4e76a6f926..6d4ab8bedde 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2012-11-19 Jason Merrill + + PR c++/55261 + * class.c (add_implicitly_declared_members): Use + lookup_fnfields_slot to get the base constructors. + 2012-11-19 Jakub Jelinek PR middle-end/54630 diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 2737cbc3ecf..04f9df5a23a 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -3014,7 +3014,8 @@ add_implicitly_declared_members (tree t, tree* access_decls, if (DECL_SELF_REFERENCE_P (decl)) { /* declare, then remove the decl */ - tree ctor_list = CLASSTYPE_CONSTRUCTORS (TREE_TYPE (decl)); + tree ctor_list = lookup_fnfields_slot (TREE_TYPE (decl), + ctor_identifier); location_t loc = input_location; input_location = DECL_SOURCE_LOCATION (using_decl); if (ctor_list) diff --git a/gcc/testsuite/g++.dg/cpp0x/inh-ctor14.C b/gcc/testsuite/g++.dg/cpp0x/inh-ctor14.C new file mode 100644 index 00000000000..2032ad3ddd7 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/inh-ctor14.C @@ -0,0 +1,10 @@ +// PR c++/55261 +// { dg-options -std=c++11 } + +struct A +{ +}; +struct B : A +{ + using A::A; +}; -- 2.30.2