diff options
| author | Alexander Monakov <amonakov@ispras.ru> | 2018-09-03 19:46:46 +0300 |
|---|---|---|
| committer | Alexander Monakov <amonakov@gcc.gnu.org> | 2018-09-03 19:46:46 +0300 |
| commit | 71acd8b9d9d8c9437bfffa51f1b56f93cfbc20e9 (patch) | |
| tree | aeb1615ea6e77b0603ffbf15f04db99c43128a8f /gcc | |
| parent | 158985b1a59e33d6536cb570bb5fbc9b79c96034 (diff) | |
| download | gcc-71acd8b9d9d8c9437bfffa51f1b56f93cfbc20e9.zip gcc-71acd8b9d9d8c9437bfffa51f1b56f93cfbc20e9.tar.gz gcc-71acd8b9d9d8c9437bfffa51f1b56f93cfbc20e9.tar.bz2 | |
qsort_chk: call from gcc_qsort instead of wrapping it
* sort.cc (gcc_qsort) [CHECKING_P]: Call qsort_chk.
* system.h (qsort): Always redirect to gcc_qsort. Update comment.
* vec.c (qsort_chk): Do not call gcc_qsort. Update comment.
From-SVN: r264065
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/sort.cc | 3 | ||||
| -rw-r--r-- | gcc/system.h | 8 | ||||
| -rw-r--r-- | gcc/vec.c | 13 |
4 files changed, 13 insertions, 17 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4b5669c..bfa9ce6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-09-03 Alexander Monakov <amonakov@ispras.ru> + + * sort.cc (gcc_qsort) [CHECKING_P]: Call qsort_chk. + * system.h (qsort): Always redirect to gcc_qsort. Update comment. + * vec.c (qsort_chk): Do not call gcc_qsort. Update comment. + 2018-09-03 Segher Boessenkool <segher@kernel.crashing.org> * config/rs6000/rs6000.md (*mov<mode>_hardfloat32): Remove %U from the diff --git a/gcc/sort.cc b/gcc/sort.cc index 293e205..9f8ee12 100644 --- a/gcc/sort.cc +++ b/gcc/sort.cc @@ -229,4 +229,7 @@ gcc_qsort (void *vbase, size_t n, size_t size, cmp_fn *cmp) mergesort (base, &c, n, base, (char *)buf); if (buf != scratch) free (buf); +#if CHECKING_P + qsort_chk (vbase, n, size, cmp); +#endif } diff --git a/gcc/system.h b/gcc/system.h index f87fbaa..203c6a4 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -1197,17 +1197,13 @@ helper_const_non_const_cast (const char *p) /* Get definitions of HOST_WIDE_INT. */ #include "hwint.h" -/* qsort comparator consistency checking: except in release-checking compilers, - redirect 4-argument qsort calls to qsort_chk; keep 1-argument invocations +/* GCC qsort API-compatible functions: except in release-checking compilers, + redirect 4-argument qsort calls to gcc_qsort; keep 1-argument invocations corresponding to vec::qsort (cmp): they use C qsort internally anyway. */ void qsort_chk (void *, size_t, size_t, int (*)(const void *, const void *)); void gcc_qsort (void *, size_t, size_t, int (*)(const void *, const void *)); #define PP_5th(a1, a2, a3, a4, a5, ...) a5 #undef qsort -#if CHECKING_P -#define qsort(...) PP_5th (__VA_ARGS__, qsort_chk, 3, 2, qsort, 0) (__VA_ARGS__) -#else #define qsort(...) PP_5th (__VA_ARGS__, gcc_qsort, 3, 2, qsort, 0) (__VA_ARGS__) -#endif #endif /* ! GCC_SYSTEM_H */ @@ -201,21 +201,12 @@ qsort_chk_error (const void *p1, const void *p2, const void *p3, internal_error ("qsort checking failed"); } -/* Wrapper around qsort with checking that CMP is consistent on given input. - - Strictly speaking, passing invalid (non-transitive, non-anti-commutative) - comparators to libc qsort can result in undefined behavior. Therefore we - should ideally perform consistency checks prior to invoking qsort, but in - order to do that optimally we'd need to sort the array ourselves beforehand - with a sorting routine known to be "safe". Instead, we expect that most - implementations in practice will still produce some permutation of input - array even for invalid comparators, which enables us to perform checks on - the output array. */ +/* Verify anti-symmetry and transitivity for comparator CMP on sorted array + of N SIZE-sized elements pointed to by BASE. */ void qsort_chk (void *base, size_t n, size_t size, int (*cmp)(const void *, const void *)) { - gcc_qsort (base, n, size, cmp); #if 0 #define LIM(n) (n) #else |