2020-01-14 Jason Merrill <jason@redhat.com>
+ PR c++/92590 - wrong handling of inherited default ctor.
+ * class.c (add_method): A constrained inherited ctor doesn't hide an
+ implicit derived ctor.
+ Revert:
+ PR c++/92552 - ICE with inherited constrained default ctor.
+ * pt.c (instantiate_class_template_1): Copy
+ TYPE_HAS_USER_CONSTRUCTOR.
+ 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++/92594 - ICE with inherited trivial default ctor.
+ * method.c (trivial_fn_p): Treat an inherited default constructor
+ like a normal default 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.
{
special_function_kind sfk = special_memfn_p (method);
- if (sfk == sfk_none)
+ if (sfk == sfk_none || DECL_INHERITED_CTOR (fn))
/* Non-special member functions coexist if they are not
- equivalently constrained. */
+ equivalently constrained. A member function is not hidden
+ by an inherited constructor. */
continue;
/* P0848: For special member functions, deleted, unsatisfied, or
/* 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
maybe_warn_cpp0x (CPP0X_INHERITING_CTORS);
lookup.name = ctor_identifier;
CLASSTYPE_NON_AGGREGATE (current) = true;
- TYPE_HAS_USER_CONSTRUCTOR (current) = true;
}
/* Cannot introduce a constructor name. */
SET_TYPE_ALIGN (type, TYPE_ALIGN (pattern));
TYPE_USER_ALIGN (type) = TYPE_USER_ALIGN (pattern);
CLASSTYPE_NON_AGGREGATE (type) = CLASSTYPE_NON_AGGREGATE (pattern);
- TYPE_HAS_USER_CONSTRUCTOR (type) = TYPE_HAS_USER_CONSTRUCTOR (pattern);
if (ANON_AGGR_TYPE_P (pattern))
SET_ANON_AGGR_TYPE_P (type);
if (CLASSTYPE_VISIBILITY_SPECIFIED (pattern))
};
template<typename T>
- struct S2 : S1<T> {
+ struct S2 : S1<T> { // { dg-error "no matching function" }
using S1<T>::S1; // { dg-error "no matching function" }
};
int main() {
S2<X> s1(0); // { dg-error "use of deleted function" }
- S2<X> s2; // { dg-error "no matching function" }
+ S2<X> s2; // { dg-error "use of deleted function" }
}
--- /dev/null
+// PR c++/92590
+// { dg-do compile { target c++11 } }
+
+class Base {
+ protected:
+ Base();
+};
+
+class Derived : public Base {
+ public:
+ using Base::Base;
+};
+
+Derived d;
struct B2 {
B2(double) { }
};
-struct D1 : B1 {
+struct D1 : B1 { // { dg-error "no match" }
using B1::B1; // implicitly declares D1(int)
int x;
};
void test() {
D1 d(6); // OK: d.x is not initialized
- D1 e; // { dg-error "no match" } D1 has no default constructor
+ D1 e; // { dg-error "deleted" } D1 has no default constructor
}
struct D2 : B2 {
using B2::B2; // { dg-error "B1::B1" }
int get();
-struct D1 : B1 {
+struct D1 : B1 { // { dg-message "B1::B1" }
using B1::B1; // inherits B1(int, ...)
int x;
int y = get();
D1 d(2, 3, 4); // OK: B1 is initialized by calling B1(2, 3, 4),
// then d.x is default-initialized (no initialization is performed),
// then d.y is initialized by calling get()
- D1 e; // { dg-error "" } D1 has no default constructor
+ D1 e; // { dg-error "" } D1 has a deleted default constructor
}
struct D2 : B2 {
};
template<typename T>
- struct S2 : S1<T> {
+ struct S2 : S1<T> { // { dg-error "matching" }
using S1<T>::S1;
};
int main() {
- S2<int> s; // { dg-error "no matching function" }
+ S2<int> s; // { dg-error "deleted function" }
}
template <typename> A(typename A::X) {} // { dg-error "incomplete" }
};
-A<void> a; // { dg-message "no match" }
+// We currently don't give the "no match" error because we don't add the
+// invalid constructor template to TYPE_METHODS.
+A<void> a; // { dg-message "required" }
void f ()
{
- Test<void> c; // { dg-error "no match" }
+ Test<void> c; // { dg-message "required" }
}