[NFC][sanitizer] constexpr in sanitizer_dense_map_info

This commit is contained in:
Vitaly Buka 2021-12-01 12:35:29 -08:00
parent afe43e0713
commit 86f48fbb1c
1 changed files with 81 additions and 59 deletions

View File

@ -18,7 +18,7 @@ namespace __sanitizer {
namespace detail { namespace detail {
/// Simplistic combination of 32-bit hash values into 32-bit hash values. /// Simplistic combination of 32-bit hash values into 32-bit hash values.
static inline unsigned combineHashValue(unsigned a, unsigned b) { static constexpr unsigned combineHashValue(unsigned a, unsigned b) {
u64 key = (u64)a << 32 | (u64)b; u64 key = (u64)a << 32 | (u64)b;
key += ~(key << 32); key += ~(key << 32);
key ^= (key >> 22); key ^= (key >> 22);
@ -37,18 +37,19 @@ template <typename KeyT, typename ValueT>
struct DenseMapPair { struct DenseMapPair {
KeyT first = {}; KeyT first = {};
ValueT second = {}; ValueT second = {};
DenseMapPair() = default; constexpr DenseMapPair() = default;
DenseMapPair(const KeyT &f, const ValueT &s) : first(f), second(s) {} constexpr DenseMapPair(const KeyT &f, const ValueT &s)
: first(f), second(s) {}
template <typename KeyT2, typename ValueT2> template <typename KeyT2, typename ValueT2>
DenseMapPair(KeyT2 &&f, ValueT2 &&s) constexpr DenseMapPair(KeyT2 &&f, ValueT2 &&s)
: first(__sanitizer::forward<KeyT2>(f)), : first(__sanitizer::forward<KeyT2>(f)),
second(__sanitizer::forward<ValueT2>(s)) {} second(__sanitizer::forward<ValueT2>(s)) {}
DenseMapPair(const DenseMapPair &other) = default; constexpr DenseMapPair(const DenseMapPair &other) = default;
DenseMapPair &operator=(const DenseMapPair &other) = default; constexpr DenseMapPair &operator=(const DenseMapPair &other) = default;
DenseMapPair(DenseMapPair &&other) = default; constexpr DenseMapPair(DenseMapPair &&other) = default;
DenseMapPair &operator=(DenseMapPair &&other) = default; constexpr DenseMapPair &operator=(DenseMapPair &&other) = default;
KeyT &getFirst() { return first; } KeyT &getFirst() { return first; }
const KeyT &getFirst() const { return first; } const KeyT &getFirst() const { return first; }
@ -60,8 +61,8 @@ struct DenseMapPair {
template <typename T> template <typename T>
struct DenseMapInfo { struct DenseMapInfo {
// static inline T getEmptyKey(); // static T getEmptyKey();
// static inline T getTombstoneKey(); // static T getTombstoneKey();
// static unsigned getHashValue(const T &Val); // static unsigned getHashValue(const T &Val);
// static bool isEqual(const T &LHS, const T &RHS); // static bool isEqual(const T &LHS, const T &RHS);
}; };
@ -79,43 +80,50 @@ struct DenseMapInfo<T *> {
// "Log2MaxAlign bits of alignment"); // "Log2MaxAlign bits of alignment");
static constexpr uptr Log2MaxAlign = 12; static constexpr uptr Log2MaxAlign = 12;
static inline T *getEmptyKey() { static constexpr T *getEmptyKey() {
uptr Val = static_cast<uptr>(-1); uptr Val = static_cast<uptr>(-1);
Val <<= Log2MaxAlign; Val <<= Log2MaxAlign;
return reinterpret_cast<T *>(Val); return reinterpret_cast<T *>(Val);
} }
static inline T *getTombstoneKey() { static constexpr T *getTombstoneKey() {
uptr Val = static_cast<uptr>(-2); uptr Val = static_cast<uptr>(-2);
Val <<= Log2MaxAlign; Val <<= Log2MaxAlign;
return reinterpret_cast<T *>(Val); return reinterpret_cast<T *>(Val);
} }
static unsigned getHashValue(const T *PtrVal) { static constexpr unsigned getHashValue(const T *PtrVal) {
return (unsigned((uptr)PtrVal) >> 4) ^ (unsigned((uptr)PtrVal) >> 9); return (unsigned((uptr)PtrVal) >> 4) ^ (unsigned((uptr)PtrVal) >> 9);
} }
static bool isEqual(const T *LHS, const T *RHS) { return LHS == RHS; } static constexpr bool isEqual(const T *LHS, const T *RHS) {
return LHS == RHS;
}
}; };
// Provide DenseMapInfo for chars. // Provide DenseMapInfo for chars.
template <> template <>
struct DenseMapInfo<char> { struct DenseMapInfo<char> {
static inline char getEmptyKey() { return ~0; } static constexpr char getEmptyKey() { return ~0; }
static inline char getTombstoneKey() { return ~0 - 1; } static constexpr char getTombstoneKey() { return ~0 - 1; }
static unsigned getHashValue(const char &Val) { return Val * 37U; } static constexpr unsigned getHashValue(const char &Val) { return Val * 37U; }
static bool isEqual(const char &LHS, const char &RHS) { return LHS == RHS; } static constexpr bool isEqual(const char &LHS, const char &RHS) {
return LHS == RHS;
}
}; };
// Provide DenseMapInfo for unsigned chars. // Provide DenseMapInfo for unsigned chars.
template <> template <>
struct DenseMapInfo<unsigned char> { struct DenseMapInfo<unsigned char> {
static inline unsigned char getEmptyKey() { return ~0; } static constexpr unsigned char getEmptyKey() { return ~0; }
static inline unsigned char getTombstoneKey() { return ~0 - 1; } static constexpr unsigned char getTombstoneKey() { return ~0 - 1; }
static unsigned getHashValue(const unsigned char &Val) { return Val * 37U; } static constexpr unsigned getHashValue(const unsigned char &Val) {
return Val * 37U;
}
static bool isEqual(const unsigned char &LHS, const unsigned char &RHS) { static constexpr bool isEqual(const unsigned char &LHS,
const unsigned char &RHS) {
return LHS == RHS; return LHS == RHS;
} }
}; };
@ -123,11 +131,14 @@ struct DenseMapInfo<unsigned char> {
// Provide DenseMapInfo for unsigned shorts. // Provide DenseMapInfo for unsigned shorts.
template <> template <>
struct DenseMapInfo<unsigned short> { struct DenseMapInfo<unsigned short> {
static inline unsigned short getEmptyKey() { return 0xFFFF; } static constexpr unsigned short getEmptyKey() { return 0xFFFF; }
static inline unsigned short getTombstoneKey() { return 0xFFFF - 1; } static constexpr unsigned short getTombstoneKey() { return 0xFFFF - 1; }
static unsigned getHashValue(const unsigned short &Val) { return Val * 37U; } static constexpr unsigned getHashValue(const unsigned short &Val) {
return Val * 37U;
}
static bool isEqual(const unsigned short &LHS, const unsigned short &RHS) { static constexpr bool isEqual(const unsigned short &LHS,
const unsigned short &RHS) {
return LHS == RHS; return LHS == RHS;
} }
}; };
@ -135,11 +146,13 @@ struct DenseMapInfo<unsigned short> {
// Provide DenseMapInfo for unsigned ints. // Provide DenseMapInfo for unsigned ints.
template <> template <>
struct DenseMapInfo<unsigned> { struct DenseMapInfo<unsigned> {
static inline unsigned getEmptyKey() { return ~0U; } static constexpr unsigned getEmptyKey() { return ~0U; }
static inline unsigned getTombstoneKey() { return ~0U - 1; } static constexpr unsigned getTombstoneKey() { return ~0U - 1; }
static unsigned getHashValue(const unsigned &Val) { return Val * 37U; } static constexpr unsigned getHashValue(const unsigned &Val) {
return Val * 37U;
}
static bool isEqual(const unsigned &LHS, const unsigned &RHS) { static constexpr bool isEqual(const unsigned &LHS, const unsigned &RHS) {
return LHS == RHS; return LHS == RHS;
} }
}; };
@ -147,14 +160,15 @@ struct DenseMapInfo<unsigned> {
// Provide DenseMapInfo for unsigned longs. // Provide DenseMapInfo for unsigned longs.
template <> template <>
struct DenseMapInfo<unsigned long> { struct DenseMapInfo<unsigned long> {
static inline unsigned long getEmptyKey() { return ~0UL; } static constexpr unsigned long getEmptyKey() { return ~0UL; }
static inline unsigned long getTombstoneKey() { return ~0UL - 1L; } static constexpr unsigned long getTombstoneKey() { return ~0UL - 1L; }
static unsigned getHashValue(const unsigned long &Val) { static constexpr unsigned getHashValue(const unsigned long &Val) {
return (unsigned)(Val * 37UL); return (unsigned)(Val * 37UL);
} }
static bool isEqual(const unsigned long &LHS, const unsigned long &RHS) { static constexpr bool isEqual(const unsigned long &LHS,
const unsigned long &RHS) {
return LHS == RHS; return LHS == RHS;
} }
}; };
@ -162,14 +176,14 @@ struct DenseMapInfo<unsigned long> {
// Provide DenseMapInfo for unsigned long longs. // Provide DenseMapInfo for unsigned long longs.
template <> template <>
struct DenseMapInfo<unsigned long long> { struct DenseMapInfo<unsigned long long> {
static inline unsigned long long getEmptyKey() { return ~0ULL; } static constexpr unsigned long long getEmptyKey() { return ~0ULL; }
static inline unsigned long long getTombstoneKey() { return ~0ULL - 1ULL; } static constexpr unsigned long long getTombstoneKey() { return ~0ULL - 1ULL; }
static unsigned getHashValue(const unsigned long long &Val) { static constexpr unsigned getHashValue(const unsigned long long &Val) {
return (unsigned)(Val * 37ULL); return (unsigned)(Val * 37ULL);
} }
static bool isEqual(const unsigned long long &LHS, static constexpr bool isEqual(const unsigned long long &LHS,
const unsigned long long &RHS) { const unsigned long long &RHS) {
return LHS == RHS; return LHS == RHS;
} }
@ -178,51 +192,59 @@ struct DenseMapInfo<unsigned long long> {
// Provide DenseMapInfo for shorts. // Provide DenseMapInfo for shorts.
template <> template <>
struct DenseMapInfo<short> { struct DenseMapInfo<short> {
static inline short getEmptyKey() { return 0x7FFF; } static constexpr short getEmptyKey() { return 0x7FFF; }
static inline short getTombstoneKey() { return -0x7FFF - 1; } static constexpr short getTombstoneKey() { return -0x7FFF - 1; }
static unsigned getHashValue(const short &Val) { return Val * 37U; } static constexpr unsigned getHashValue(const short &Val) { return Val * 37U; }
static bool isEqual(const short &LHS, const short &RHS) { return LHS == RHS; } static constexpr bool isEqual(const short &LHS, const short &RHS) {
return LHS == RHS;
}
}; };
// Provide DenseMapInfo for ints. // Provide DenseMapInfo for ints.
template <> template <>
struct DenseMapInfo<int> { struct DenseMapInfo<int> {
static inline int getEmptyKey() { return 0x7fffffff; } static constexpr int getEmptyKey() { return 0x7fffffff; }
static inline int getTombstoneKey() { return -0x7fffffff - 1; } static constexpr int getTombstoneKey() { return -0x7fffffff - 1; }
static unsigned getHashValue(const int &Val) { return (unsigned)(Val * 37U); } static constexpr unsigned getHashValue(const int &Val) {
return (unsigned)(Val * 37U);
}
static bool isEqual(const int &LHS, const int &RHS) { return LHS == RHS; } static constexpr bool isEqual(const int &LHS, const int &RHS) {
return LHS == RHS;
}
}; };
// Provide DenseMapInfo for longs. // Provide DenseMapInfo for longs.
template <> template <>
struct DenseMapInfo<long> { struct DenseMapInfo<long> {
static inline long getEmptyKey() { static constexpr long getEmptyKey() {
return (1UL << (sizeof(long) * 8 - 1)) - 1UL; return (1UL << (sizeof(long) * 8 - 1)) - 1UL;
} }
static inline long getTombstoneKey() { return getEmptyKey() - 1L; } static constexpr long getTombstoneKey() { return getEmptyKey() - 1L; }
static unsigned getHashValue(const long &Val) { static constexpr unsigned getHashValue(const long &Val) {
return (unsigned)(Val * 37UL); return (unsigned)(Val * 37UL);
} }
static bool isEqual(const long &LHS, const long &RHS) { return LHS == RHS; } static constexpr bool isEqual(const long &LHS, const long &RHS) {
return LHS == RHS;
}
}; };
// Provide DenseMapInfo for long longs. // Provide DenseMapInfo for long longs.
template <> template <>
struct DenseMapInfo<long long> { struct DenseMapInfo<long long> {
static inline long long getEmptyKey() { return 0x7fffffffffffffffLL; } static constexpr long long getEmptyKey() { return 0x7fffffffffffffffLL; }
static inline long long getTombstoneKey() { static constexpr long long getTombstoneKey() {
return -0x7fffffffffffffffLL - 1; return -0x7fffffffffffffffLL - 1;
} }
static unsigned getHashValue(const long long &Val) { static constexpr unsigned getHashValue(const long long &Val) {
return (unsigned)(Val * 37ULL); return (unsigned)(Val * 37ULL);
} }
static bool isEqual(const long long &LHS, const long long &RHS) { static constexpr bool isEqual(const long long &LHS, const long long &RHS) {
return LHS == RHS; return LHS == RHS;
} }
}; };
@ -234,22 +256,22 @@ struct DenseMapInfo<detail::DenseMapPair<T, U>> {
using FirstInfo = DenseMapInfo<T>; using FirstInfo = DenseMapInfo<T>;
using SecondInfo = DenseMapInfo<U>; using SecondInfo = DenseMapInfo<U>;
static inline Pair getEmptyKey() { static constexpr Pair getEmptyKey() {
return detail::DenseMapPair<T, U>(FirstInfo::getEmptyKey(), return detail::DenseMapPair<T, U>(FirstInfo::getEmptyKey(),
SecondInfo::getEmptyKey()); SecondInfo::getEmptyKey());
} }
static inline Pair getTombstoneKey() { static constexpr Pair getTombstoneKey() {
return detail::DenseMapPair<T, U>(FirstInfo::getTombstoneKey(), return detail::DenseMapPair<T, U>(FirstInfo::getTombstoneKey(),
SecondInfo::getTombstoneKey()); SecondInfo::getTombstoneKey());
} }
static unsigned getHashValue(const Pair &PairVal) { static constexpr unsigned getHashValue(const Pair &PairVal) {
return detail::combineHashValue(FirstInfo::getHashValue(PairVal.first), return detail::combineHashValue(FirstInfo::getHashValue(PairVal.first),
SecondInfo::getHashValue(PairVal.second)); SecondInfo::getHashValue(PairVal.second));
} }
static bool isEqual(const Pair &LHS, const Pair &RHS) { static constexpr bool isEqual(const Pair &LHS, const Pair &RHS) {
return FirstInfo::isEqual(LHS.first, RHS.first) && return FirstInfo::isEqual(LHS.first, RHS.first) &&
SecondInfo::isEqual(LHS.second, RHS.second); SecondInfo::isEqual(LHS.second, RHS.second);
} }