From: Jason Merrill <jason@redhat.com>
Date: Thu, 17 Nov 2016 21:41:09 +0000 (-0500)
Subject: PR c++/78124 - list-initialization and inherited ctor
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f8691e98180da3205b8a19ff34f6656c46c4c92a;p=gcc.git

PR c++/78124 - list-initialization and inherited ctor

	* name-lookup.c (do_class_using_decl): Set CLASSTYPE_NON_AGGREGATE.

From-SVN: r242563
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 50d0ae21aad..24564ecfaa6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2016-11-17  Jason Merrill  <jason@redhat.com>
 
+	PR c++/78124 - list-initialization and inherited ctor
+	* name-lookup.c (do_class_using_decl): Set CLASSTYPE_NON_AGGREGATE.
+
 	PR c++/78369 - {} as default argument
 	* call.c (build_special_member_call): Handle CONSTRUCTOR.
 
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index cb1b9faef0e..e5f9113134f 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -5707,7 +5707,6 @@ extern bool type_has_user_nondefault_constructor (tree);
 extern tree in_class_defaulted_default_constructor (tree);
 extern bool user_provided_p			(tree);
 extern bool type_has_user_provided_constructor  (tree);
-extern bool type_has_user_provided_or_explicit_constructor  (tree);
 extern bool type_has_non_user_provided_default_constructor (tree);
 extern bool vbase_has_user_provided_move_assign (tree);
 extern tree default_init_uninitialized_part (tree);
diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 7ad65b89599..4f80e8d5af9 100644
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -3382,6 +3382,7 @@ do_class_using_decl (tree scope, tree name)
     {
       maybe_warn_cpp0x (CPP0X_INHERITING_CTORS);
       name = ctor_identifier;
+      CLASSTYPE_NON_AGGREGATE (current_class_type) = true;
     }
   if (constructor_name_p (name, current_class_type))
     {
diff --git a/gcc/testsuite/g++.dg/cpp0x/inh-ctor23.C b/gcc/testsuite/g++.dg/cpp0x/inh-ctor23.C
new file mode 100644
index 00000000000..1bb05a25c66
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/inh-ctor23.C
@@ -0,0 +1,16 @@
+// PR c++/78124
+// { dg-do compile { target c++11 } }
+
+struct base {
+    explicit constexpr base(int&&) {}
+};
+
+struct derived: base {
+    using base::base;
+};
+
+int main()
+{
+    derived d { 0 };
+}
+