public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-3584] c++: set TREE_NOTHROW after genericize
@ 2022-11-01  1:23 Jason Merrill
  0 siblings, 0 replies; only message in thread
From: Jason Merrill @ 2022-11-01  1:23 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:43c40f114a68edc9a9cc9963dc940c11806ff863

commit r13-3584-g43c40f114a68edc9a9cc9963dc940c11806ff863
Author: Jason Merrill <jason@redhat.com>
Date:   Mon Oct 31 13:38:41 2022 -0400

    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:
---
 gcc/cp/decl.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc
index 87cb7a6c3a4..6e98ea35a39 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)

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-11-01  1:23 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-01  1:23 [gcc r13-3584] c++: set TREE_NOTHROW after genericize Jason Merrill

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).