Daily bump.

diff --git a/gcc/DATESTAMP b/gcc/DATESTAMP
index 01fc321fe049db49f04f68f7953ac7ad0eefb42d..36722b9e985e7b53105b370e478768a4c373e014 100644 (file)
--- a/gcc/DATESTAMP
+++ b/gcc/DATESTAMP
@@ -1 +1 @@
-20231117
+20231118

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fbb4cf3ba02eac7c5fc6d9d826ceb977342c17ac..4fa88118e7645b7eb9f4833391109ae2b8043fc2 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,28 @@
+2023-11-17  Jason Merrill  <jason@redhat.com>
+
+       PR c++/112301
+       PR c++/102191
+       PR c++/33799
+       * except.cc (maybe_splice_retval_cleanup): Clear
+       current_retval_sentinel when destroying retval.
+       * semantics.cc (nrv_data): Add in_nrv_cleanup.
+       (finalize_nrv): Set it.
+       (finalize_nrv_r): Fix handling of throwing cleanups.
+
+2023-11-17  Jason Merrill  <jason@redhat.com>
+
+       * semantics.cc (finalize_nrv_r): [RETURN_EXPR]: Only replace the
+       INIT_EXPR.
+
+2023-11-17  Jason Merrill  <jason@redhat.com>
+
+       PR c++/33799
+       * except.cc (maybe_splice_retval_cleanup): Change
+       recognition of function body and try scopes.
+       * semantics.cc (do_poplevel): Call it after poplevel.
+       (at_try_scope): New.
+       * cp-tree.h (maybe_splice_retval_cleanup): Adjust.
+
 2023-08-11  Jason Merrill  <jason@redhat.com>
 
        PR c++/106310

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2e2d06dbb1ac0d9ceee40246379af4eaec81761c..966da5dfcef8ffbf9dcbac709407507736c9cc5f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2023-11-17  Jason Merrill  <jason@redhat.com>
+
+       PR c++/112301
+       PR c++/102191
+       PR c++/33799
+       * g++.dg/eh/return1.C: Add more cases.
+
+2023-11-17  Jason Merrill  <jason@redhat.com>
+
+       PR c++/33799
+       * g++.dg/eh/return1.C: Add label cases.
+
 2023-11-16  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnat.dg/varsize4.adb (Func): Initialize Byte_Read parameter.