diff options
| author | Martin Liska <mliska@suse.cz> | 2022-09-26 21:05:44 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-09-26 21:05:44 +0200 |
| commit | 3c527a35fa428b727807c81f1225a5e0025446c1 (patch) | |
| tree | 787e21d7bf8a1d85ac7b9ccee784909e85ebf61b /libgcc | |
| parent | c9c59aa19c0b7159636763294b7b0c87c696d675 (diff) | |
| parent | 7701ea4a70a5a5c0fd977da90a30ffc4f3f87617 (diff) | |
| download | gcc-3c527a35fa428b727807c81f1225a5e0025446c1.zip gcc-3c527a35fa428b727807c81f1225a5e0025446c1.tar.gz gcc-3c527a35fa428b727807c81f1225a5e0025446c1.tar.bz2 | |
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'libgcc')
| -rw-r--r-- | libgcc/ChangeLog | 7 | ||||
| -rw-r--r-- | libgcc/unwind-dw2-fde.c | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 7c434c9..9ebfaa0 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,10 @@ +2022-09-22 Thomas Neumann <tneumann@users.sourceforge.net> + + * unwind-dw2-fde.c: (release_register_frames) Remember + when the btree has been destroyed. + (__deregister_frame_info_bases) Disable the assert when + shutting down. + 2022-09-18 Thomas Neumann <tneumann@users.sourceforge.net> * unwind-dw2-fde.c: Replace uintptr_t with typedef diff --git a/libgcc/unwind-dw2-fde.c b/libgcc/unwind-dw2-fde.c index 919abfe..3c0cc65 100644 --- a/libgcc/unwind-dw2-fde.c +++ b/libgcc/unwind-dw2-fde.c @@ -48,15 +48,17 @@ 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))); +release_registered_frames (void) __attribute__ ((destructor)); static void release_registered_frames (void) { /* Release the b-tree and all frames. Frame releases that happen later are * silently ignored */ btree_destroy (®istered_frames); + in_shutdown = true; } static void @@ -65,6 +67,8 @@ static void init_object (struct object *ob); #else +/* Without fast path frame deregistration must always succeed. */ +static const int in_shutdown = 0; /* The unseen_objects list contains objects that have been registered but not yet categorized in any way. The seen_objects list has had @@ -282,7 +286,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; } |