public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-1515] fix radix sort on 32bit platforms [PR109670]
@ 2023-06-03  7:47 Thomas Neumann
  0 siblings, 0 replies; only message in thread
From: Thomas Neumann @ 2023-06-03  7:47 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:38e88d41f50d844f1404172657ef7e8372014ef6

commit r14-1515-g38e88d41f50d844f1404172657ef7e8372014ef6
Author: Thomas Neumann <tneumann@users.sourceforge.net>
Date:   Wed May 10 12:33:49 2023 +0200

    fix radix sort on 32bit platforms [PR109670]
    
    The radix sort uses two buffers, a1 for input and a2 for output.
    After every digit the role of the two buffers is swapped.
    When terminating the sort early the code made sure the output
    was in a2.  However, when we run out of bits, as can happen on
    32bit platforms, the sorted result was in a1, as we had just
    swapped a1 and a2.
    This patch fixes the problem by unconditionally having a1 as
    output after every loop iteration.
    
    This bug manifested itself only on 32bit platforms and even then
    only in some circumstances, as it needs frames where a swap
    is required due to differences in the top-most byte, which is
    affected by ASLR. The new logic was validated by exhaustive
    search over 32bit input values.
    
    libgcc/ChangeLog:
            PR libgcc/109670
            * unwind-dw2-fde.c: Fix radix sort buffer management.

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

diff --git a/libgcc/unwind-dw2-fde.c b/libgcc/unwind-dw2-fde.c
index 32b9e64a1c8..d7c4a467754 100644
--- a/libgcc/unwind-dw2-fde.c
+++ b/libgcc/unwind-dw2-fde.c
@@ -634,8 +634,6 @@ fde_radixsort (struct object *ob, fde_extractor_t fde_extractor,
       // Stop if we are already sorted.
       if (!violations)
 	{
-	  // The sorted data is in a1 now.
-	  a2 = a1;
 	  break;
 	}
 
@@ -670,9 +668,9 @@ fde_radixsort (struct object *ob, fde_extractor_t fde_extractor,
 #undef FANOUT
 #undef FANOUTBITS
 
-  // The data is in a2 now, move in place if needed.
-  if (a2 != v1->array)
-    memcpy (v1->array, a2, sizeof (const fde *) * n);
+  // The data is in a1 now, move in place if needed.
+  if (a1 != v1->array)
+    memcpy (v1->array, a1, sizeof (const fde *) * n);
 }
 
 static inline void

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

only message in thread, other threads:[~2023-06-03  7:47 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-03  7:47 [gcc r14-1515] fix radix sort on 32bit platforms [PR109670] Thomas Neumann

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).