public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-3304] libstdc++: Define std::numeric_limits<_FloatNN> before C++23
@ 2023-08-17 20:31 Jonathan Wakely
  0 siblings, 0 replies; only message in thread
From: Jonathan Wakely @ 2023-08-17 20:31 UTC (permalink / raw)
  To: gcc-cvs, libstdc++-cvs

https://gcc.gnu.org/g:1a566fddea212a6a8e4484f7843d8e5d39b5bff0

commit r14-3304-g1a566fddea212a6a8e4484f7843d8e5d39b5bff0
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon Aug 7 12:52:57 2023 +0100

    libstdc++: Define std::numeric_limits<_FloatNN> before C++23
    
    The extended floating-point types such as _Float32 are supported by GCC
    prior to C++23, you just can't use the standard-conforming names from
    <stdfloat> to refer to them. This change defines the specializations of
    std::numeric_limits for those types for older dialects, not only for
    C++23.
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/c++config (__gnu_cxx::__bfloat16_t): Define
            whenever __BFLT16_DIG__ is defined, not only for C++23.
            * include/std/limits (numeric_limits<bfloat16_t>): Likewise.
            (numeric_limits<_Float16>, numeric_limits<_Float32>)
            (numeric_limits<_Float64>): Likewise for other extended
            floating-point types.

Diff:
---
 libstdc++-v3/include/bits/c++config |   4 +-
 libstdc++-v3/include/std/limits     | 194 +++++++++++++++++++-----------------
 2 files changed, 103 insertions(+), 95 deletions(-)

diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index dd47f274d5ff..0a41cdd29a9a 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -822,10 +822,10 @@ namespace std
 # define _GLIBCXX_LDOUBLE_IS_IEEE_BINARY128 1
 #endif
 
-#ifdef __STDCPP_BFLOAT16_T__
+#if defined __cplusplus && defined __BFLT16_DIG__
 namespace __gnu_cxx
 {
-  using __bfloat16_t = decltype(0.0bf16);
+  typedef __decltype(0.0bf16) __bfloat16_t;
 }
 #endif
 
diff --git a/libstdc++-v3/include/std/limits b/libstdc++-v3/include/std/limits
index 52b19ef8264a..7a59e7520ebc 100644
--- a/libstdc++-v3/include/std/limits
+++ b/libstdc++-v3/include/std/limits
@@ -1890,189 +1890,197 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 #undef __glibcxx_long_double_traps
 #undef __glibcxx_long_double_tinyness_before
 
-#if __cplusplus > 202002L
-
 #define __glibcxx_concat3_(P,M,S) P ## M ## S
 #define __glibcxx_concat3(P,M,S) __glibcxx_concat3_ (P,M,S)
 
+#if __cplusplus >= 201103L
+# define __max_digits10 max_digits10
+#endif
+
 #define __glibcxx_float_n(BITSIZE)					\
   __extension__								\
   template<>								\
     struct numeric_limits<_Float##BITSIZE>				\
     {									\
-      static constexpr bool is_specialized = true;			\
+      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;		\
 									\
-      static constexpr _Float##BITSIZE					\
-      min() noexcept							\
+      static _GLIBCXX_CONSTEXPR _Float##BITSIZE				\
+      min() _GLIBCXX_USE_NOEXCEPT					\
       { return __glibcxx_concat3 (__FLT, BITSIZE, _MIN__); }		\
 									\
-      static constexpr _Float##BITSIZE					\
-      max() noexcept							\
+      static _GLIBCXX_CONSTEXPR _Float##BITSIZE				\
+      max() _GLIBCXX_USE_NOEXCEPT					\
       { return __glibcxx_concat3 (__FLT, BITSIZE, _MAX__); }		\
 									\
-      static constexpr _Float##BITSIZE					\
-      lowest() noexcept							\
+      static _GLIBCXX_CONSTEXPR _Float##BITSIZE				\
+      lowest() _GLIBCXX_USE_NOEXCEPT					\
       { return -__glibcxx_concat3 (__FLT, BITSIZE, _MAX__); }		\
 									\
-      static constexpr int digits					\
+      static _GLIBCXX_USE_CONSTEXPR int digits				\
 	= __glibcxx_concat3 (__FLT, BITSIZE, _MANT_DIG__);		\
-      static constexpr int digits10					\
+      static _GLIBCXX_USE_CONSTEXPR int digits10			\
 	= __glibcxx_concat3 (__FLT, BITSIZE, _DIG__);			\
-      static constexpr int max_digits10					\
+      static _GLIBCXX_USE_CONSTEXPR int __max_digits10			\
 	= __glibcxx_max_digits10 (__glibcxx_concat3 (__FLT, BITSIZE,	\
 						     _MANT_DIG__));	\
-      static constexpr bool is_signed = true;				\
-      static constexpr bool is_integer = false;				\
-      static constexpr bool is_exact = false;				\
-      static constexpr int radix = __FLT_RADIX__;			\
+      static _GLIBCXX_USE_CONSTEXPR bool is_signed = true;		\
+      static _GLIBCXX_USE_CONSTEXPR bool is_integer = false;		\
+      static _GLIBCXX_USE_CONSTEXPR bool is_exact = false;		\
+      static _GLIBCXX_USE_CONSTEXPR int radix = __FLT_RADIX__;		\
 									\
-      static constexpr _Float##BITSIZE					\
-      epsilon() noexcept						\
+      static _GLIBCXX_CONSTEXPR _Float##BITSIZE				\
+      epsilon() _GLIBCXX_USE_NOEXCEPT					\
       { return __glibcxx_concat3 (__FLT, BITSIZE, _EPSILON__); }	\
 									\
-      static constexpr _Float##BITSIZE 					\
-      round_error() noexcept { return 0.5F##BITSIZE; }			\
+      static _GLIBCXX_CONSTEXPR _Float##BITSIZE 			\
+      round_error() _GLIBCXX_USE_NOEXCEPT { return 0.5F##BITSIZE; }	\
 									\
-      static constexpr int min_exponent					\
+      static _GLIBCXX_USE_CONSTEXPR int min_exponent			\
 	= __glibcxx_concat3 (__FLT, BITSIZE, _MIN_EXP__);		\
-      static constexpr int min_exponent10				\
+      static _GLIBCXX_USE_CONSTEXPR int min_exponent10			\
 	= __glibcxx_concat3 (__FLT, BITSIZE, _MIN_10_EXP__);		\
-      static constexpr int max_exponent					\
+      static _GLIBCXX_USE_CONSTEXPR int max_exponent			\
 	= __glibcxx_concat3 (__FLT, BITSIZE, _MAX_EXP__);		\
-      static constexpr int max_exponent10				\
+      static _GLIBCXX_USE_CONSTEXPR int max_exponent10			\
 	= __glibcxx_concat3 (__FLT, BITSIZE, _MAX_10_EXP__);		\
 									\
-      static constexpr bool has_infinity				\
+      static _GLIBCXX_USE_CONSTEXPR bool has_infinity			\
 	= __glibcxx_concat3 (__FLT, BITSIZE, _HAS_INFINITY__);		\
-      static constexpr bool has_quiet_NaN				\
+      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN			\
 	= __glibcxx_concat3 (__FLT, BITSIZE, _HAS_QUIET_NAN__);		\
-      static constexpr bool has_signaling_NaN				\
+      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN		\
 	= has_quiet_NaN;						\
-      static constexpr float_denorm_style has_denorm			\
+      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm	\
 	= bool(__glibcxx_concat3 (__FLT, BITSIZE, _HAS_DENORM__))	\
 	  ? denorm_present : denorm_absent;				\
-      static constexpr bool has_denorm_loss = false;			\
+      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;	\
 									\
-      static constexpr _Float##BITSIZE					\
-      infinity() noexcept						\
+      static _GLIBCXX_CONSTEXPR _Float##BITSIZE				\
+      infinity() _GLIBCXX_USE_NOEXCEPT					\
       { return __builtin_huge_valf##BITSIZE(); }			\
 									\
-      static constexpr _Float##BITSIZE					\
-      quiet_NaN() noexcept						\
+      static _GLIBCXX_CONSTEXPR _Float##BITSIZE				\
+      quiet_NaN() _GLIBCXX_USE_NOEXCEPT					\
       { return __builtin_nanf##BITSIZE(""); }				\
 									\
-      static constexpr _Float##BITSIZE					\
-      signaling_NaN() noexcept						\
+      static _GLIBCXX_CONSTEXPR _Float##BITSIZE				\
+      signaling_NaN() _GLIBCXX_USE_NOEXCEPT				\
       { return __builtin_nansf##BITSIZE(""); }				\
 									\
-      static constexpr _Float##BITSIZE					\
-      denorm_min() noexcept						\
+      static _GLIBCXX_CONSTEXPR _Float##BITSIZE				\
+      denorm_min() _GLIBCXX_USE_NOEXCEPT				\
       { return __glibcxx_concat3 (__FLT, BITSIZE, _DENORM_MIN__); }	\
 									\
-      static constexpr bool is_iec559					\
+      static _GLIBCXX_USE_CONSTEXPR bool is_iec559			\
 	= has_infinity && has_quiet_NaN && has_denorm == denorm_present;\
-      static constexpr bool is_bounded = true; 				\
-      static constexpr bool is_modulo = false; 				\
+      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true; 		\
+      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = false; 		\
 									\
-      static constexpr bool traps = false; 				\
-      static constexpr bool tinyness_before = false; 			\
-      static constexpr float_round_style round_style 			\
+      static _GLIBCXX_USE_CONSTEXPR bool traps = false; 		\
+      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false; 	\
+      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style 	\
 	= round_to_nearest; 						\
     }; 									\
 
-#ifdef __STDCPP_FLOAT16_T__
+#ifdef __FLT16_DIG__
 __glibcxx_float_n(16)
 #endif
-#ifdef __STDCPP_FLOAT32_T__
+#ifdef __FLT32_DIG__
 __glibcxx_float_n(32)
 #endif
-#ifdef __STDCPP_FLOAT64_T__
+#ifdef __FLT64_DIG__
 __glibcxx_float_n(64)
 #endif
-#ifdef __STDCPP_FLOAT128_T__
+#ifdef __FLT128_DIG__
 __glibcxx_float_n(128)
 #endif
 #undef __glibcxx_float_n
 #undef __glibcxx_concat3
 #undef __glibcxx_concat3_
 
-#ifdef __STDCPP_BFLOAT16_T__
+#if __cplusplus >= 201103L
+# undef __max_digits10
+#endif
+
+#ifdef __BFLT16_DIG__
   __extension__
   template<>
     struct numeric_limits<__gnu_cxx::__bfloat16_t>
     {
-      static constexpr bool is_specialized = true;
+      static _GLIBCXX_USE_CONSTEXPR bool is_specialized = true;
 
-      static constexpr __gnu_cxx::__bfloat16_t
-      min() noexcept
+      static _GLIBCXX_CONSTEXPR __gnu_cxx::__bfloat16_t
+      min() _GLIBCXX_USE_NOEXCEPT
       { return __BFLT16_MIN__; }
 
-      static constexpr __gnu_cxx::__bfloat16_t
-      max() noexcept
+      static _GLIBCXX_CONSTEXPR __gnu_cxx::__bfloat16_t
+      max() _GLIBCXX_USE_NOEXCEPT
       { return __BFLT16_MAX__; }
 
-      static constexpr __gnu_cxx::__bfloat16_t
-      lowest() noexcept
+      static _GLIBCXX_CONSTEXPR __gnu_cxx::__bfloat16_t
+      lowest() _GLIBCXX_USE_NOEXCEPT
       { return -__BFLT16_MAX__; }
 
-      static constexpr int digits = __BFLT16_MANT_DIG__;
-      static constexpr int digits10 = __BFLT16_DIG__;
-      static constexpr int max_digits10
+      static _GLIBCXX_USE_CONSTEXPR int digits = __BFLT16_MANT_DIG__;
+      static _GLIBCXX_USE_CONSTEXPR int digits10 = __BFLT16_DIG__;
+#if __cplusplus >= 201103L
+      static _GLIBCXX_USE_CONSTEXPR int max_digits10
 	= __glibcxx_max_digits10 (__BFLT16_MANT_DIG__);
-      static constexpr bool is_signed = true;
-      static constexpr bool is_integer = false;
-      static constexpr bool is_exact = false;
-      static constexpr int radix = __FLT_RADIX__;
+#endif
+      static _GLIBCXX_USE_CONSTEXPR bool is_signed = true;
+      static _GLIBCXX_USE_CONSTEXPR bool is_integer = false;
+      static _GLIBCXX_USE_CONSTEXPR bool is_exact = false;
+      static _GLIBCXX_USE_CONSTEXPR int radix = __FLT_RADIX__;
 
-      static constexpr __gnu_cxx::__bfloat16_t
-      epsilon() noexcept
+      static _GLIBCXX_CONSTEXPR __gnu_cxx::__bfloat16_t
+      epsilon() _GLIBCXX_USE_NOEXCEPT
       { return __BFLT16_EPSILON__; }
 
-      static constexpr __gnu_cxx::__bfloat16_t
-      round_error() noexcept { return 0.5BF16; }
+      static _GLIBCXX_CONSTEXPR __gnu_cxx::__bfloat16_t
+      round_error() _GLIBCXX_USE_NOEXCEPT { return 0.5BF16; }
 
-      static constexpr int min_exponent = __BFLT16_MIN_EXP__;
-      static constexpr int min_exponent10 = __BFLT16_MIN_10_EXP__;
-      static constexpr int max_exponent = __BFLT16_MAX_EXP__;
-      static constexpr int max_exponent10 = __BFLT16_MAX_10_EXP__;
+      static _GLIBCXX_USE_CONSTEXPR int min_exponent = __BFLT16_MIN_EXP__;
+      static _GLIBCXX_USE_CONSTEXPR int min_exponent10 = __BFLT16_MIN_10_EXP__;
+      static _GLIBCXX_USE_CONSTEXPR int max_exponent = __BFLT16_MAX_EXP__;
+      static _GLIBCXX_USE_CONSTEXPR int max_exponent10 = __BFLT16_MAX_10_EXP__;
 
-      static constexpr bool has_infinity = __BFLT16_HAS_INFINITY__;
-      static constexpr bool has_quiet_NaN = __BFLT16_HAS_QUIET_NAN__;
-      static constexpr bool has_signaling_NaN = has_quiet_NaN;
-      static constexpr float_denorm_style has_denorm
-	= bool(__BFLT16_HAS_DENORM__)
-	  ? denorm_present : denorm_absent;
-      static constexpr bool has_denorm_loss = false;
+      static _GLIBCXX_USE_CONSTEXPR bool has_infinity
+	= __BFLT16_HAS_INFINITY__;
+      static _GLIBCXX_USE_CONSTEXPR bool has_quiet_NaN
+	= __BFLT16_HAS_QUIET_NAN__;
+      static _GLIBCXX_USE_CONSTEXPR bool has_signaling_NaN = has_quiet_NaN;
+      static _GLIBCXX_USE_CONSTEXPR float_denorm_style has_denorm
+	= bool(__BFLT16_HAS_DENORM__) ? denorm_present : denorm_absent;
+      static _GLIBCXX_USE_CONSTEXPR bool has_denorm_loss = false;
 
-      static constexpr __gnu_cxx::__bfloat16_t
-      infinity() noexcept
+      static _GLIBCXX_CONSTEXPR __gnu_cxx::__bfloat16_t
+      infinity() _GLIBCXX_USE_NOEXCEPT
       { return __gnu_cxx::__bfloat16_t(__builtin_huge_valf()); }
 
-      static constexpr __gnu_cxx::__bfloat16_t
-      quiet_NaN() noexcept
+      static _GLIBCXX_CONSTEXPR __gnu_cxx::__bfloat16_t
+      quiet_NaN() _GLIBCXX_USE_NOEXCEPT
       { return __gnu_cxx::__bfloat16_t(__builtin_nanf("")); }
 
-      static constexpr __gnu_cxx::__bfloat16_t
-      signaling_NaN() noexcept
+      static _GLIBCXX_CONSTEXPR __gnu_cxx::__bfloat16_t
+      signaling_NaN() _GLIBCXX_USE_NOEXCEPT
       { return __builtin_nansf16b(""); }
 
-      static constexpr __gnu_cxx::__bfloat16_t
-      denorm_min() noexcept
+      static _GLIBCXX_CONSTEXPR __gnu_cxx::__bfloat16_t
+      denorm_min() _GLIBCXX_USE_NOEXCEPT
       { return __BFLT16_DENORM_MIN__; }
 
-      static constexpr bool is_iec559
+      static _GLIBCXX_USE_CONSTEXPR bool is_iec559
 	= has_infinity && has_quiet_NaN && has_denorm == denorm_present;
-      static constexpr bool is_bounded = true;
-      static constexpr bool is_modulo = false;
+      static _GLIBCXX_USE_CONSTEXPR bool is_bounded = true;
+      static _GLIBCXX_USE_CONSTEXPR bool is_modulo = false;
 
-      static constexpr bool traps = false;
-      static constexpr bool tinyness_before = false;
-      static constexpr float_round_style round_style = round_to_nearest;
+      static _GLIBCXX_USE_CONSTEXPR bool traps = false;
+      static _GLIBCXX_USE_CONSTEXPR bool tinyness_before = false;
+      static _GLIBCXX_USE_CONSTEXPR float_round_style round_style
+	= round_to_nearest;
     };
 #endif
 
-#endif // C++23
-
 #if defined(_GLIBCXX_USE_FLOAT128)
 // We either need Q literal suffixes, or IEEE double.
 #if ! defined(__STRICT_ANSI__) || defined(_GLIBCXX_DOUBLE_IS_IEEE_BINARY64)

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-08-17 20:31 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-17 20:31 [gcc r14-3304] libstdc++: Define std::numeric_limits<_FloatNN> before C++23 Jonathan Wakely

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).