From: Jason Merrill <jason@redhat.com>
Date: Mon, 31 Oct 2022 17:38:41 +0000 (-0400)
Subject: c++: set TREE_NOTHROW after genericize
X-Git-Tag: basepoints/gcc-14~3623
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43c40f114a68edc9a9cc9963dc940c11806ff863;p=thirdparty%2Fgcc.git

c++: set TREE_NOTHROW after genericize

genericize might introduce function calls (and does on the contracts
branch), so it's safer to set this flag later.

gcc/cp/ChangeLog:

	* decl.cc (finish_function): Set TREE_NOTHROW later in the function.
---

diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index 87cb7a6c3a41..6e98ea35a394 100644
--- a/gcc/cp/decl.cc
+++ b/gcc/cp/decl.cc
@@ -17867,14 +17867,6 @@ finish_function (bool inline_p)
 
   finish_fname_decls ();
 
-  /* If this function can't throw any exceptions, remember that.  */
-  if (!processing_template_decl
-      && !cp_function_chain->can_throw
-      && !flag_non_call_exceptions
-      && !decl_replaceable_p (fndecl,
-			      opt_for_fn (fndecl, flag_semantic_interposition)))
-    TREE_NOTHROW (fndecl) = 1;
-
   /* This must come after expand_function_end because cleanups might
      have declarations (from inline functions) that need to go into
      this function's blocks.  */
@@ -18099,6 +18091,14 @@ finish_function (bool inline_p)
       && !DECL_OMP_DECLARE_REDUCTION_P (fndecl))
     cp_genericize (fndecl);
 
+  /* If this function can't throw any exceptions, remember that.  */
+  if (!processing_template_decl
+      && !cp_function_chain->can_throw
+      && !flag_non_call_exceptions
+      && !decl_replaceable_p (fndecl,
+			      opt_for_fn (fndecl, flag_semantic_interposition)))
+    TREE_NOTHROW (fndecl) = 1;
+
   /* Emit the resumer and destroyer functions now, providing that we have
      not encountered some fatal error.  */
   if (coro_emit_helpers)