diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/method.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/inh-ctor34.C | 13 |
3 files changed, 23 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index f7e5e74..3fd35b4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2020-01-14 Jason Merrill <jason@redhat.com> + PR c++/92594 - ICE with inherited trivial default ctor. + * method.c (trivial_fn_p): Treat an inherited default constructor + like a normal default constructor. + PR c++/92009 - ICE with punning of typeid. * rtti.c (get_tinfo_desc): Call xref_basetypes. * constexpr.c (cxx_fold_indirect_ref): Don't strip diff --git a/gcc/cp/method.c b/gcc/cp/method.c index fef19e1..e20a88f 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -458,7 +458,12 @@ trivial_fn_p (tree fn) /* If fn is a clone, get the primary variant. */ if (tree prim = DECL_CLONED_FUNCTION (fn)) fn = prim; - return type_has_trivial_fn (DECL_CONTEXT (fn), special_function_p (fn)); + special_function_kind sfk = special_function_p (fn); + /* An inherited default constructor is equivalent to a non-inherited default + constructor, so let it be trivial. */ + if (sfk == sfk_inheriting_constructor && default_ctor_p (fn)) + sfk = sfk_constructor; + return type_has_trivial_fn (DECL_CONTEXT (fn), sfk); } /* PARM is a PARM_DECL for a function which we want to forward to another diff --git a/gcc/testsuite/g++.dg/cpp0x/inh-ctor34.C b/gcc/testsuite/g++.dg/cpp0x/inh-ctor34.C new file mode 100644 index 0000000..9afc0e9 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/inh-ctor34.C @@ -0,0 +1,13 @@ +// PR c++/92594 +// { dg-do compile { target c++11 } } + +template <typename _Head> struct tuple { + tuple() : _M_head_impl() {} + _Head _M_head_impl; +}; +template <typename type0> struct pod_tuple { type0 _head; }; +struct e {}; +struct bar : e { + using e::e; +}; +int main() { tuple<pod_tuple<bar>> a; } |