[PATCH] D132813: [Support] Simplify isInt and isUInt with constexpr if (NFC)
Kazu Hirata via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Sat Sep 3 23:27:58 PDT 2022
This revision was automatically updated to reflect the committed changes.
Closed by commit rGee40ef7aafe5: [Support] Simplify isInt and isUInt with constexpr if (NFC) (authored by kazu).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D132813/new/
https://reviews.llvm.org/D132813
Files:
llvm/include/llvm/Support/MathExtras.h
Index: llvm/include/llvm/Support/MathExtras.h
===================================================================
--- llvm/include/llvm/Support/MathExtras.h
+++ llvm/include/llvm/Support/MathExtras.h
@@ -356,17 +356,16 @@
/// Checks if an integer fits into the given bit width.
template <unsigned N> constexpr inline bool isInt(int64_t x) {
- return N >= 64 || (-(INT64_C(1)<<(N-1)) <= x && x < (INT64_C(1)<<(N-1)));
-}
-// Template specializations to get better code for common cases.
-template <> constexpr inline bool isInt<8>(int64_t x) {
- return static_cast<int8_t>(x) == x;
-}
-template <> constexpr inline bool isInt<16>(int64_t x) {
- return static_cast<int16_t>(x) == x;
-}
-template <> constexpr inline bool isInt<32>(int64_t x) {
- return static_cast<int32_t>(x) == x;
+ if constexpr (N == 8)
+ return static_cast<int8_t>(x) == x;
+ if constexpr (N == 16)
+ return static_cast<int16_t>(x) == x;
+ if constexpr (N == 32)
+ return static_cast<int32_t>(x) == x;
+ if constexpr (N < 64)
+ return -(INT64_C(1) << (N - 1)) <= x && x < (INT64_C(1) << (N - 1));
+ (void)x; // MSVC v19.25 warns that x is unused.
+ return true;
}
/// Checks if a signed integer is an N bit number shifted left by S.
@@ -379,34 +378,20 @@
}
/// Checks if an unsigned integer fits into the given bit width.
-///
-/// This is written as two functions rather than as simply
-///
-/// return N >= 64 || X < (UINT64_C(1) << N);
-///
-/// to keep MSVC from (incorrectly) warning on isUInt<64> that we're shifting
-/// left too many places.
-template <unsigned N>
-constexpr inline std::enable_if_t<(N < 64), bool> isUInt(uint64_t X) {
+template <unsigned N> constexpr inline bool isUInt(uint64_t x) {
static_assert(N > 0, "isUInt<0> doesn't make sense");
- return X < (UINT64_C(1) << (N));
-}
-template <unsigned N>
-constexpr inline std::enable_if_t<N >= 64, bool> isUInt(uint64_t) {
+ if constexpr (N == 8)
+ return static_cast<uint8_t>(x) == x;
+ if constexpr (N == 16)
+ return static_cast<uint16_t>(x) == x;
+ if constexpr (N == 32)
+ return static_cast<uint32_t>(x) == x;
+ if constexpr (N < 64)
+ return x < (UINT64_C(1) << (N));
+ (void)x; // MSVC v19.25 warns that x is unused.
return true;
}
-// Template specializations to get better code for common cases.
-template <> constexpr inline bool isUInt<8>(uint64_t x) {
- return static_cast<uint8_t>(x) == x;
-}
-template <> constexpr inline bool isUInt<16>(uint64_t x) {
- return static_cast<uint16_t>(x) == x;
-}
-template <> constexpr inline bool isUInt<32>(uint64_t x) {
- return static_cast<uint32_t>(x) == x;
-}
-
/// Checks if a unsigned integer is an N bit number shifted left by S.
template <unsigned N, unsigned S>
constexpr inline bool isShiftedUInt(uint64_t x) {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D132813.457840.patch
Type: text/x-patch
Size: 2780 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220904/eb719007/attachment.bin>
More information about the llvm-commits
mailing list