[llvm] bfb0b6f - [ADT] Simplify getAsInteger and consumeInteger (NFC)
Kazu Hirata via llvm-commits
llvm-commits at lists.llvm.org
Sat Oct 15 14:08:11 PDT 2022
Author: Kazu Hirata
Date: 2022-10-15T14:08:02-07:00
New Revision: bfb0b6f48db15e2e6d7c40edae7c8b4bc95c07fb
URL: https://github.com/llvm/llvm-project/commit/bfb0b6f48db15e2e6d7c40edae7c8b4bc95c07fb
DIFF: https://github.com/llvm/llvm-project/commit/bfb0b6f48db15e2e6d7c40edae7c8b4bc95c07fb.diff
LOG: [ADT] Simplify getAsInteger and consumeInteger (NFC)
This patch replaces the std::enable_if_t trick with a "constexpr if"
so that the resulting code looks more like "normal" C++ code.
Differential Revision: https://reviews.llvm.org/D136024
Added:
Modified:
llvm/include/llvm/ADT/StringRef.h
Removed:
################################################################################
diff --git a/llvm/include/llvm/ADT/StringRef.h b/llvm/include/llvm/ADT/StringRef.h
index 25dcda02eae1..02159eb07866 100644
--- a/llvm/include/llvm/ADT/StringRef.h
+++ b/llvm/include/llvm/ADT/StringRef.h
@@ -458,28 +458,23 @@ namespace llvm {
/// If the string is invalid or if only a subset of the string is valid,
/// this returns true to signify the error. The string is considered
/// erroneous if empty or if it overflows T.
- template <typename T>
- std::enable_if_t<std::numeric_limits<T>::is_signed, bool>
- getAsInteger(unsigned Radix, T &Result) const {
- long long LLVal;
- if (getAsSignedInteger(*this, Radix, LLVal) ||
+ template <typename T> bool getAsInteger(unsigned Radix, T &Result) const {
+ if constexpr (std::numeric_limits<T>::is_signed) {
+ long long LLVal;
+ if (getAsSignedInteger(*this, Radix, LLVal) ||
static_cast<T>(LLVal) != LLVal)
- return true;
- Result = LLVal;
- return false;
- }
-
- template <typename T>
- std::enable_if_t<!std::numeric_limits<T>::is_signed, bool>
- getAsInteger(unsigned Radix, T &Result) const {
- unsigned long long ULLVal;
- // The additional cast to unsigned long long is required to avoid the
- // Visual C++ warning C4805: '!=' : unsafe mix of type 'bool' and type
- // 'unsigned __int64' when instantiating getAsInteger with T = bool.
- if (getAsUnsignedInteger(*this, Radix, ULLVal) ||
- static_cast<unsigned long long>(static_cast<T>(ULLVal)) != ULLVal)
- return true;
- Result = ULLVal;
+ return true;
+ Result = LLVal;
+ } else {
+ unsigned long long ULLVal;
+ // The additional cast to unsigned long long is required to avoid the
+ // Visual C++ warning C4805: '!=' : unsafe mix of type 'bool' and type
+ // 'unsigned __int64' when instantiating getAsInteger with T = bool.
+ if (getAsUnsignedInteger(*this, Radix, ULLVal) ||
+ static_cast<unsigned long long>(static_cast<T>(ULLVal)) != ULLVal)
+ return true;
+ Result = ULLVal;
+ }
return false;
}
@@ -492,25 +487,20 @@ namespace llvm {
/// erroneous if empty or if it overflows T.
/// The portion of the string representing the discovered numeric value
/// is removed from the beginning of the string.
- template <typename T>
- std::enable_if_t<std::numeric_limits<T>::is_signed, bool>
- consumeInteger(unsigned Radix, T &Result) {
- long long LLVal;
- if (consumeSignedInteger(*this, Radix, LLVal) ||
- static_cast<long long>(static_cast<T>(LLVal)) != LLVal)
- return true;
- Result = LLVal;
- return false;
- }
-
- template <typename T>
- std::enable_if_t<!std::numeric_limits<T>::is_signed, bool>
- consumeInteger(unsigned Radix, T &Result) {
- unsigned long long ULLVal;
- if (consumeUnsignedInteger(*this, Radix, ULLVal) ||
- static_cast<unsigned long long>(static_cast<T>(ULLVal)) != ULLVal)
- return true;
- Result = ULLVal;
+ template <typename T> bool consumeInteger(unsigned Radix, T &Result) {
+ if constexpr (std::numeric_limits<T>::is_signed) {
+ long long LLVal;
+ if (consumeSignedInteger(*this, Radix, LLVal) ||
+ static_cast<long long>(static_cast<T>(LLVal)) != LLVal)
+ return true;
+ Result = LLVal;
+ } else {
+ unsigned long long ULLVal;
+ if (consumeUnsignedInteger(*this, Radix, ULLVal) ||
+ static_cast<unsigned long long>(static_cast<T>(ULLVal)) != ULLVal)
+ return true;
+ Result = ULLVal;
+ }
return false;
}
More information about the llvm-commits
mailing list