From 545fc87454aabbc8ef8720811ab5dbd5588b537b Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 1 Dec 2008 16:50:01 +0000 Subject: [PATCH] define array_pod_sort in terms of operator< instead of my brain damaged approximation. This should fix it on big endian platforms and on 64-bit. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60352 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ADT/STLExtras.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/include/llvm/ADT/STLExtras.h b/include/llvm/ADT/STLExtras.h index 87f7a117251..5685729eb51 100644 --- a/include/llvm/ADT/STLExtras.h +++ b/include/llvm/ADT/STLExtras.h @@ -222,18 +222,14 @@ inline size_t array_lengthof(T (&x)[N]) { } /// array_pod_sort_comparator - This is helper function for array_pod_sort, -/// which does a memcmp of a specific size. -template +/// which just uses operator< on T. +template static inline int array_pod_sort_comparator(const void *P1, const void *P2) { - if (Size == sizeof(char)) - return *(const char*)P1 - *(const char*)P2; - if (Size == sizeof(int)) - return *(const int*)P1 - *(const int*)P2; - if (Size == sizeof(long long)) - return *(const long long*)P1 - *(const long long*)P2; - if (Size == sizeof(intptr_t)) - return *(intptr_t*)P1 - *(intptr_t*)P2; - return memcmp(P1, P2, Size); + if (*reinterpret_cast(P1) < *reinterpret_cast(P2)) + return -1; + if (*reinterpret_cast(P2) < *reinterpret_cast(P1)) + return 1; + return 0; } /// array_pod_sort - This sorts an array with the specified start and end @@ -245,8 +241,8 @@ static inline int array_pod_sort_comparator(const void *P1, const void *P2) { /// possible. /// /// This function assumes that you have simple POD-like types that can be -/// compared with memcmp and can be moved with memcpy. If this isn't true, you -/// should use std::sort. +/// compared with operator< and can be moved with memcpy. If this isn't true, +/// you should use std::sort. /// /// NOTE: If qsort_r were portable, we could allow a custom comparator and /// default to std::less. -- 2.34.1