Add ChangeLog entries for 86d8e0c0652ef5236a460b75c25e4f7093cc0651.

gcc/cp/ChangeLog:

	* ChangeLog: Add entry for
	86d8e0c0652ef5236a460b75c25e4f7093cc0651.

gcc/testsuite/ChangeLog:

	* ChangeLog: Add entry for
	86d8e0c0652ef5236a460b75c25e4f7093cc0651.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 46f7d7d8a1db70935d70235a7bfc65c372f304d5..48b9136dcb1f1ede99de4cb07eeac39c18484311 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -5,6 +5,28 @@
        * coroutines.cc (morph_fn_to_coro): Reset
        current_binding_level->blocks.
 
+2022-04-01  Jason Merrill  <jason@redhat.com>
+
+       Revert:
+       2022-03-31  Jason Merrill  <jason@redhat.com>
+
+       PR c++/96645
+       * parser.cc (cp_parser_early_parsing_nsdmi): New.
+       (cp_parser_member_declaration): Call it.
+
+2022-04-01  Jason Merrill  <jason@redhat.com>
+
+       Revert:
+       2022-03-24  Jason Merrill  <jason@redhat.com>
+
+       PR c++/96645
+       * cp-tree.h (type_has_default_ctor_to_be_synthesized): Declare.
+       * class.cc (type_has_default_ctor_to_be_synthesized): New.
+       (type_has_non_user_provided_default_constructor_1): Support it.
+       (type_has_non_user_provided_default_constructor): Now a wrapper.
+       * method.cc (complain_about_unparsed_dmi): New.
+       (constructible_expr): Call it.
+
 2022-04-01  Patrick Palka  <ppalka@redhat.com>
 
        PR c++/105110

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 02413154a9ec404ba2cd7c6b67113999b905754e..6fc3f68bf572a002a57e2f7341d798ecc1e4c3b5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -21,6 +21,25 @@
 
        * gcc.dg/fixed-point/composite-type.c: Add -Wno-array-parameter.
 
+2022-04-01  Jason Merrill  <jason@redhat.com>
+
+       Revert:
+       2022-03-31  Jason Merrill  <jason@redhat.com>
+
+       PR c++/96645
+       * g++.dg/cpp0x/nsdmi10.C: Now OK.
+       * g++.dg/ext/is_constructible3.C: Likewise.
+       * g++.dg/ext/is_constructible7.C: Likewise.
+
+2022-04-01  Jason Merrill  <jason@redhat.com>
+
+       Revert:
+       2022-03-24  Jason Merrill  <jason@redhat.com>
+
+       PR c++/96645
+       * g++.dg/ext/is_constructible3.C: Expect error.
+       * g++.dg/ext/is_constructible7.C: New test.
+
 2022-04-01  Patrick Palka  <ppalka@redhat.com>
 
        PR c++/105110