diff options
| author | Jason Merrill <jason@redhat.com> | 2020-01-14 13:59:54 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2020-01-14 15:20:12 -0500 |
| commit | 08c8c973c082457a7d6192673e87475f1fdfdbef (patch) | |
| tree | b04556341be3025f2077cdc3fe0e0c9fa9122bcf /gcc/cp/method.c | |
| parent | a5a3c2dcf73aa245b0eb6f6cf56c4d03ab6056da (diff) | |
| download | gcc-08c8c973c082457a7d6192673e87475f1fdfdbef.zip gcc-08c8c973c082457a7d6192673e87475f1fdfdbef.tar.gz gcc-08c8c973c082457a7d6192673e87475f1fdfdbef.tar.bz2 | |
PR c++/92590 - wrong handling of inherited default ctor.
I thought my earlier fix for 91930 was an obvious bug fix, but apparently an
inherited constructor does not count as user-declared. So this patch
reverts that change and the other follow-on patches, and fixes 91930
differently, by not letting the inherited default constructor hide the
implicitly-declared default constructor.
* class.c (add_method): A constrained inherited ctor doesn't hide an
implicit derived ctor.
Revert:
PR c++/91930 - ICE with constrained inherited default ctor.
* name-lookup.c (do_class_using_decl): Set TYPE_HAS_USER_CONSTRUCTOR
for inherited constructor.
PR c++/92552 - ICE with inherited constrained default ctor.
* pt.c (instantiate_class_template_1): Copy
TYPE_HAS_USER_CONSTRUCTOR.
PR c++/92594 - ICE with inherited trivial default ctor.
* method.c (trivial_fn_p): Treat an inherited default constructor
like a normal default constructor.
Diffstat (limited to 'gcc/cp/method.c')
| -rw-r--r-- | gcc/cp/method.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gcc/cp/method.c b/gcc/cp/method.c index e20a88f..fef19e1 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -458,12 +458,7 @@ trivial_fn_p (tree fn) /* If fn is a clone, get the primary variant. */ if (tree prim = DECL_CLONED_FUNCTION (fn)) fn = prim; - 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); + return type_has_trivial_fn (DECL_CONTEXT (fn), special_function_p (fn)); } /* PARM is a PARM_DECL for a function which we want to forward to another |