public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Thomas Neumann <tneumann@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r13-2801] Avoid depending on destructor order
Date: Thu, 22 Sep 2022 23:26:50 +0000 (GMT)	[thread overview]
Message-ID: <20220922232650.122183858D38@sourceware.org> (raw)

https://gcc.gnu.org/g:94ccaf62c378c3737f7e4b6a80e1160157119171

commit r13-2801-g94ccaf62c378c3737f7e4b6a80e1160157119171
Author: Thomas Neumann <tneumann@users.sourceforge.net>
Date:   Mon Sep 19 18:10:02 2022 +0200

    Avoid depending on destructor order
    
    In some scenarios (e.g., when mixing gcc and clang code), it can
    happen that frames are deregistered after the lookup structure
    has already been destroyed. That in itself would be fine, but
    it triggers an assert in __deregister_frame_info_bases that
    expects to find the frame.
    
    To avoid that, we now remember that the btree as already been
    destroyed and disable the assert in that case.
    
    libgcc/ChangeLog:
    
            * unwind-dw2-fde.c: (release_register_frames) Remember
            when the btree has been destroyed.
            (__deregister_frame_info_bases) Disable the assert when
            shutting down.

Diff:
---
 libgcc/unwind-dw2-fde.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libgcc/unwind-dw2-fde.c b/libgcc/unwind-dw2-fde.c
index 919abfe0664..d237179f4ea 100644
--- a/libgcc/unwind-dw2-fde.c
+++ b/libgcc/unwind-dw2-fde.c
@@ -48,6 +48,7 @@ typedef __UINTPTR_TYPE__ uintptr_type;
 #include "unwind-dw2-btree.h"
 
 static struct btree registered_frames;
+static bool in_shutdown;
 
 static void
 release_registered_frames (void) __attribute__ ((destructor (110)));
@@ -57,6 +58,7 @@ release_registered_frames (void)
   /* Release the b-tree and all frames. Frame releases that happen later are
    * silently ignored */
   btree_destroy (&registered_frames);
+  in_shutdown = true;
 }
 
 static void
@@ -282,7 +284,7 @@ __deregister_frame_info_bases (const void *begin)
   __gthread_mutex_unlock (&object_mutex);
 #endif
 
-  gcc_assert (ob);
+  gcc_assert (in_shutdown || ob);
   return (void *) ob;
 }

                 reply	other threads:[~2022-09-22 23:26 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220922232650.122183858D38@sourceware.org \
    --to=tneumann@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).