[libc-commits] [libc] [libc][NFC] Rename `FPBits` nan functions (PR #79998)

via libc-commits libc-commits at lists.llvm.org
Tue Jan 30 04:45:43 PST 2024


llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-libc

Author: Guillaume Chatelet (gchatelet)

<details>
<summary>Changes</summary>

- [libc][NFC] Rename FPBits nan functions
- rename build_signaling_nan in signaling_nan
- rename build_quiet_nan to quiet_nan


---

Patch is 43.35 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/79998.diff


46 Files Affected:

- (modified) libc/src/__support/FPUtil/DivisionAndRemainderOperations.h (+1-1) 
- (modified) libc/src/__support/FPUtil/FPBits.h (+10-10) 
- (modified) libc/src/__support/FPUtil/generic/FMod.h (+1-1) 
- (modified) libc/src/__support/FPUtil/generic/sqrt.h (+1-1) 
- (modified) libc/src/__support/FPUtil/generic/sqrt_80_bit_long_double.h (+1-1) 
- (modified) libc/src/__support/str_to_float.h (+2-2) 
- (modified) libc/src/math/generic/acosf.cpp (+1-1) 
- (modified) libc/src/math/generic/acoshf.cpp (+1-1) 
- (modified) libc/src/math/generic/asinf.cpp (+1-1) 
- (modified) libc/src/math/generic/atanhf.cpp (+1-1) 
- (modified) libc/src/math/generic/cosf.cpp (+1-1) 
- (modified) libc/src/math/generic/log.cpp (+1-1) 
- (modified) libc/src/math/generic/log10.cpp (+1-1) 
- (modified) libc/src/math/generic/log10f.cpp (+1-1) 
- (modified) libc/src/math/generic/log1p.cpp (+1-1) 
- (modified) libc/src/math/generic/log1pf.cpp (+1-1) 
- (modified) libc/src/math/generic/log2.cpp (+1-1) 
- (modified) libc/src/math/generic/log2f.cpp (+1-1) 
- (modified) libc/src/math/generic/logf.cpp (+1-1) 
- (modified) libc/src/math/generic/powf.cpp (+1-1) 
- (modified) libc/src/math/generic/sincosf.cpp (+1-1) 
- (modified) libc/src/math/generic/sinf.cpp (+1-1) 
- (modified) libc/src/math/generic/tanf.cpp (+1-1) 
- (modified) libc/test/UnitTest/FPMatcher.h (+4-4) 
- (modified) libc/test/src/__support/FPUtil/fpbits_test.cpp (+40-36) 
- (modified) libc/test/src/math/FDimTest.h (+1-1) 
- (modified) libc/test/src/math/FmaTest.h (+1-1) 
- (modified) libc/test/src/math/HypotTest.h (+1-1) 
- (modified) libc/test/src/math/ILogbTest.h (+1-1) 
- (modified) libc/test/src/math/LdExpTest.h (+1-1) 
- (modified) libc/test/src/math/NextAfterTest.h (+1-1) 
- (modified) libc/test/src/math/RIntTest.h (+1-1) 
- (modified) libc/test/src/math/RemQuoTest.h (+1-1) 
- (modified) libc/test/src/math/RoundToIntegerTest.h (+1-1) 
- (modified) libc/test/src/math/smoke/FDimTest.h (+1-1) 
- (modified) libc/test/src/math/smoke/FmaTest.h (+1-1) 
- (modified) libc/test/src/math/smoke/HypotTest.h (+1-1) 
- (modified) libc/test/src/math/smoke/ILogbTest.h (+1-1) 
- (modified) libc/test/src/math/smoke/LdExpTest.h (+1-1) 
- (modified) libc/test/src/math/smoke/NextAfterTest.h (+1-1) 
- (modified) libc/test/src/math/smoke/NextTowardTest.h (+2-2) 
- (modified) libc/test/src/math/smoke/RIntTest.h (+1-1) 
- (modified) libc/test/src/math/smoke/RemQuoTest.h (+1-1) 
- (modified) libc/test/src/math/smoke/RoundToIntegerTest.h (+1-1) 
- (modified) libc/test/src/stdio/sprintf_test.cpp (+5-9) 
- (modified) libc/test/src/stdio/sscanf_test.cpp (+3-5) 


``````````diff
diff --git a/libc/src/__support/FPUtil/DivisionAndRemainderOperations.h b/libc/src/__support/FPUtil/DivisionAndRemainderOperations.h
index 5f542f650355..eee05c67d9e9 100644
--- a/libc/src/__support/FPUtil/DivisionAndRemainderOperations.h
+++ b/libc/src/__support/FPUtil/DivisionAndRemainderOperations.h
@@ -31,7 +31,7 @@ LIBC_INLINE T remquo(T x, T y, int &q) {
   if (ybits.is_nan())
     return y;
   if (xbits.is_inf() || ybits.is_zero())
-    return FPBits<T>::build_quiet_nan().get_val();
+    return FPBits<T>::quiet_nan().get_val();
 
   if (xbits.is_zero()) {
     q = 0;
diff --git a/libc/src/__support/FPUtil/FPBits.h b/libc/src/__support/FPUtil/FPBits.h
index 5277892ac3bb..5102c3d7935b 100644
--- a/libc/src/__support/FPUtil/FPBits.h
+++ b/libc/src/__support/FPUtil/FPBits.h
@@ -359,13 +359,13 @@ struct FPRepSem : public FPStorage<fp_type> {
   LIBC_INLINE static constexpr RetT inf(Sign sign = Sign::POS) {
     return RetT(encode(sign, BiasedExp::BITS_ALL_ONES(), Sig::ZERO()));
   }
-  LIBC_INLINE static constexpr RetT build_nan(Sign sign = Sign::POS,
-                                              StorageType v = 0) {
+  LIBC_INLINE static constexpr RetT signaling_nan(Sign sign = Sign::POS,
+                                                  StorageType v = 0) {
     return RetT(encode(sign, BiasedExp::BITS_ALL_ONES(),
                        (v ? Sig(v) : (Sig::MSB() >> 1))));
   }
-  LIBC_INLINE static constexpr RetT build_quiet_nan(Sign sign = Sign::POS,
-                                                    StorageType v = 0) {
+  LIBC_INLINE static constexpr RetT quiet_nan(Sign sign = Sign::POS,
+                                              StorageType v = 0) {
     return RetT(encode(sign, BiasedExp::BITS_ALL_ONES(), Sig::MSB() | Sig(v)));
   }
 
@@ -448,13 +448,13 @@ struct FPRepSem<FPType::X86_Binary80, RetT>
   LIBC_INLINE static constexpr RetT inf(Sign sign = Sign::POS) {
     return RetT(encode(sign, BiasedExp::BITS_ALL_ONES(), Sig::MSB()));
   }
-  LIBC_INLINE static constexpr RetT build_nan(Sign sign = Sign::POS,
-                                              StorageType v = 0) {
+  LIBC_INLINE static constexpr RetT signaling_nan(Sign sign = Sign::POS,
+                                                  StorageType v = 0) {
     return RetT(encode(sign, BiasedExp::BITS_ALL_ONES(),
                        Sig::MSB() | (v ? Sig(v) : (Sig::MSB() >> 2))));
   }
-  LIBC_INLINE static constexpr RetT build_quiet_nan(Sign sign = Sign::POS,
-                                                    StorageType v = 0) {
+  LIBC_INLINE static constexpr RetT quiet_nan(Sign sign = Sign::POS,
+                                              StorageType v = 0) {
     return RetT(encode(sign, BiasedExp::BITS_ALL_ONES(),
                        Sig::MSB() | (Sig::MSB() >> 1) | Sig(v)));
   }
@@ -577,14 +577,14 @@ struct FPRep : public FPRepSem<fp_type, RetT> {
   LIBC_INLINE static constexpr RetT zero(Sign sign = Sign::POS) {
     return RetT(encode(sign, BiasedExp::BITS_ALL_ZEROES(), Sig::ZERO()));
   }
-  using UP::build_nan;
-  using UP::build_quiet_nan;
   using UP::inf;
   using UP::max_normal;
   using UP::max_subnormal;
   using UP::min_normal;
   using UP::min_subnormal;
   using UP::one;
+  using UP::quiet_nan;
+  using UP::signaling_nan;
 
   // Modifiers
   LIBC_INLINE constexpr RetT abs() const {
diff --git a/libc/src/__support/FPUtil/generic/FMod.h b/libc/src/__support/FPUtil/generic/FMod.h
index 18355b801dbc..2d31290bc4bc 100644
--- a/libc/src/__support/FPUtil/generic/FMod.h
+++ b/libc/src/__support/FPUtil/generic/FMod.h
@@ -124,7 +124,7 @@ template <typename T> struct FModExceptionalInputHandler {
 
   LIBC_INLINE static bool pre_check(T x, T y, T &out) {
     using FPB = fputil::FPBits<T>;
-    const T quiet_nan = FPB::build_quiet_nan().get_val();
+    const T quiet_nan = FPB::quiet_nan().get_val();
     FPB sx(x), sy(y);
     if (LIBC_LIKELY(!sy.is_zero() && !sy.is_inf_or_nan() &&
                     !sx.is_inf_or_nan())) {
diff --git a/libc/src/__support/FPUtil/generic/sqrt.h b/libc/src/__support/FPUtil/generic/sqrt.h
index 6650227a014d..702de3f04a9b 100644
--- a/libc/src/__support/FPUtil/generic/sqrt.h
+++ b/libc/src/__support/FPUtil/generic/sqrt.h
@@ -74,7 +74,7 @@ LIBC_INLINE cpp::enable_if_t<cpp::is_floating_point_v<T>, T> sqrt(T x) {
     using FPBits_t = typename fputil::FPBits<T>;
     using StorageType = typename FPBits_t::StorageType;
     constexpr StorageType ONE = StorageType(1) << FPBits_t::FRACTION_LEN;
-    constexpr auto FLT_NAN = FPBits_t::build_quiet_nan().get_val();
+    constexpr auto FLT_NAN = FPBits_t::quiet_nan().get_val();
 
     FPBits_t bits(x);
 
diff --git a/libc/src/__support/FPUtil/generic/sqrt_80_bit_long_double.h b/libc/src/__support/FPUtil/generic/sqrt_80_bit_long_double.h
index 72977f616b5d..74a536c04817 100644
--- a/libc/src/__support/FPUtil/generic/sqrt_80_bit_long_double.h
+++ b/libc/src/__support/FPUtil/generic/sqrt_80_bit_long_double.h
@@ -39,7 +39,7 @@ LIBC_INLINE long double sqrt(long double x) {
   using LDBits = FPBits<long double>;
   using StorageType = typename LDBits::StorageType;
   constexpr StorageType ONE = StorageType(1) << int(LDBits::FRACTION_LEN);
-  constexpr auto LDNAN = LDBits::build_quiet_nan().get_val();
+  constexpr auto LDNAN = LDBits::quiet_nan().get_val();
 
   LDBits bits(x);
 
diff --git a/libc/src/__support/str_to_float.h b/libc/src/__support/str_to_float.h
index 7ecb6c3e02fd..f681fcab7a63 100644
--- a/libc/src/__support/str_to_float.h
+++ b/libc/src/__support/str_to_float.h
@@ -1167,7 +1167,7 @@ LIBC_INLINE StrToNumResult<T> strtofloatingpoint(const char *__restrict src) {
           index = left_paren;
         }
       }
-      result = FPBits(result.build_quiet_nan(result.sign(), nan_mantissa));
+      result = FPBits(result.quiet_nan(result.sign(), nan_mantissa));
     }
   } else if (tolower(src[index]) == 'i') { // INF
     if (tolower(src[index + 1]) == inf_string[1] &&
@@ -1215,7 +1215,7 @@ template <class T> LIBC_INLINE StrToNumResult<T> strtonan(const char *arg) {
     nan_mantissa = static_cast<StorageType>(nan_mantissa_result);
   }
 
-  result = FPBits::build_quiet_nan(fputil::Sign::POS, nan_mantissa);
+  result = FPBits::quiet_nan(fputil::Sign::POS, nan_mantissa);
   return {result.get_val(), 0, error};
 }
 
diff --git a/libc/src/math/generic/acosf.cpp b/libc/src/math/generic/acosf.cpp
index 7b2a09101182..0c1fdbc68693 100644
--- a/libc/src/math/generic/acosf.cpp
+++ b/libc/src/math/generic/acosf.cpp
@@ -85,7 +85,7 @@ LLVM_LIBC_FUNCTION(float, acosf, (float x)) {
       fputil::set_errno_if_required(EDOM);
       fputil::raise_except_if_required(FE_INVALID);
     }
-    return x + FPBits::build_quiet_nan().get_val();
+    return x + FPBits::quiet_nan().get_val();
   }
 
   // When 0.5 < |x| < 1, we perform range reduction as follow:
diff --git a/libc/src/math/generic/acoshf.cpp b/libc/src/math/generic/acoshf.cpp
index a546cc2268b0..54b66bf42fc6 100644
--- a/libc/src/math/generic/acoshf.cpp
+++ b/libc/src/math/generic/acoshf.cpp
@@ -29,7 +29,7 @@ LLVM_LIBC_FUNCTION(float, acoshf, (float x)) {
     // x < 1.
     fputil::set_errno_if_required(EDOM);
     fputil::raise_except_if_required(FE_INVALID);
-    return FPBits_t::build_quiet_nan().get_val();
+    return FPBits_t::quiet_nan().get_val();
   }
 
   if (LIBC_UNLIKELY(x_u >= 0x4f8ffb03)) {
diff --git a/libc/src/math/generic/asinf.cpp b/libc/src/math/generic/asinf.cpp
index 7655aabb7210..6e3a27238ac9 100644
--- a/libc/src/math/generic/asinf.cpp
+++ b/libc/src/math/generic/asinf.cpp
@@ -109,7 +109,7 @@ LLVM_LIBC_FUNCTION(float, asinf, (float x)) {
       fputil::set_errno_if_required(EDOM);
       fputil::raise_except_if_required(FE_INVALID);
     }
-    return FPBits::build_quiet_nan().get_val();
+    return FPBits::quiet_nan().get_val();
   }
 
   // Check for exceptional values
diff --git a/libc/src/math/generic/atanhf.cpp b/libc/src/math/generic/atanhf.cpp
index cd0acbf24e92..fe2c36494a72 100644
--- a/libc/src/math/generic/atanhf.cpp
+++ b/libc/src/math/generic/atanhf.cpp
@@ -33,7 +33,7 @@ LLVM_LIBC_FUNCTION(float, atanhf, (float x)) {
     } else {
       fputil::set_errno_if_required(EDOM);
       fputil::raise_except_if_required(FE_INVALID);
-      return FPBits::build_quiet_nan().get_val();
+      return FPBits::quiet_nan().get_val();
     }
   }
 
diff --git a/libc/src/math/generic/cosf.cpp b/libc/src/math/generic/cosf.cpp
index 132e72c0f65d..d59304933d60 100644
--- a/libc/src/math/generic/cosf.cpp
+++ b/libc/src/math/generic/cosf.cpp
@@ -118,7 +118,7 @@ LLVM_LIBC_FUNCTION(float, cosf, (float x)) {
       fputil::set_errno_if_required(EDOM);
       fputil::raise_except_if_required(FE_INVALID);
     }
-    return x + FPBits::build_quiet_nan().get_val();
+    return x + FPBits::quiet_nan().get_val();
   }
 
   // Combine the results with the sine of sum formula:
diff --git a/libc/src/math/generic/log.cpp b/libc/src/math/generic/log.cpp
index b0f7e8c9afa5..9edc52b8a8e2 100644
--- a/libc/src/math/generic/log.cpp
+++ b/libc/src/math/generic/log.cpp
@@ -754,7 +754,7 @@ LLVM_LIBC_FUNCTION(double, log, (double x)) {
     if (xbits.is_neg() && !xbits.is_nan()) {
       fputil::set_errno_if_required(EDOM);
       fputil::raise_except_if_required(FE_INVALID);
-      return FPBits_t::build_quiet_nan().get_val();
+      return FPBits_t::quiet_nan().get_val();
     }
     if (xbits.is_inf_or_nan()) {
       return x;
diff --git a/libc/src/math/generic/log10.cpp b/libc/src/math/generic/log10.cpp
index 55a3fc5c061e..b3dc8982a7fb 100644
--- a/libc/src/math/generic/log10.cpp
+++ b/libc/src/math/generic/log10.cpp
@@ -755,7 +755,7 @@ LLVM_LIBC_FUNCTION(double, log10, (double x)) {
     if (xbits.is_neg() && !xbits.is_nan()) {
       fputil::set_errno_if_required(EDOM);
       fputil::raise_except_if_required(FE_INVALID);
-      return FPBits_t::build_quiet_nan().get_val();
+      return FPBits_t::quiet_nan().get_val();
     }
     if (xbits.is_inf_or_nan()) {
       return x;
diff --git a/libc/src/math/generic/log10f.cpp b/libc/src/math/generic/log10f.cpp
index ac2e3b9cf925..0216bb2133f1 100644
--- a/libc/src/math/generic/log10f.cpp
+++ b/libc/src/math/generic/log10f.cpp
@@ -173,7 +173,7 @@ LLVM_LIBC_FUNCTION(float, log10f, (float x)) {
       // Return NaN and raise FE_INVALID
       fputil::set_errno_if_required(EDOM);
       fputil::raise_except_if_required(FE_INVALID);
-      return FPBits::build_quiet_nan().get_val();
+      return FPBits::quiet_nan().get_val();
     }
     if (xbits.is_inf_or_nan()) {
       return x;
diff --git a/libc/src/math/generic/log1p.cpp b/libc/src/math/generic/log1p.cpp
index ae432620ba32..0edab70124c9 100644
--- a/libc/src/math/generic/log1p.cpp
+++ b/libc/src/math/generic/log1p.cpp
@@ -900,7 +900,7 @@ LLVM_LIBC_FUNCTION(double, log1p, (double x)) {
           // x < -1.0
           fputil::set_errno_if_required(EDOM);
           fputil::raise_except_if_required(FE_INVALID);
-          return FPBits_t::build_quiet_nan().get_val();
+          return FPBits_t::quiet_nan().get_val();
         }
         // x is +Inf or NaN
         return x;
diff --git a/libc/src/math/generic/log1pf.cpp b/libc/src/math/generic/log1pf.cpp
index 8de4a2067f9d..71fd40d93a0a 100644
--- a/libc/src/math/generic/log1pf.cpp
+++ b/libc/src/math/generic/log1pf.cpp
@@ -47,7 +47,7 @@ LIBC_INLINE float log(double x) {
     if (xbits.is_neg() && !xbits.is_nan()) {
       fputil::set_errno_if_required(EDOM);
       fputil::raise_except_if_required(FE_INVALID);
-      return fputil::FPBits<float>::build_quiet_nan().get_val();
+      return fputil::FPBits<float>::quiet_nan().get_val();
     }
     return static_cast<float>(x);
   }
diff --git a/libc/src/math/generic/log2.cpp b/libc/src/math/generic/log2.cpp
index 480c690a6503..ab392166475c 100644
--- a/libc/src/math/generic/log2.cpp
+++ b/libc/src/math/generic/log2.cpp
@@ -876,7 +876,7 @@ LLVM_LIBC_FUNCTION(double, log2, (double x)) {
     if (xbits.is_neg() && !xbits.is_nan()) {
       fputil::set_errno_if_required(EDOM);
       fputil::raise_except_if_required(FE_INVALID);
-      return FPBits_t::build_quiet_nan().get_val();
+      return FPBits_t::quiet_nan().get_val();
     }
     if (xbits.is_inf_or_nan()) {
       return x;
diff --git a/libc/src/math/generic/log2f.cpp b/libc/src/math/generic/log2f.cpp
index e3417552ad35..8651316d282c 100644
--- a/libc/src/math/generic/log2f.cpp
+++ b/libc/src/math/generic/log2f.cpp
@@ -79,7 +79,7 @@ LLVM_LIBC_FUNCTION(float, log2f, (float x)) {
     if (xbits.is_neg() && !xbits.is_nan()) {
       fputil::set_errno_if_required(EDOM);
       fputil::raise_except(FE_INVALID);
-      return FPBits::build_quiet_nan().get_val();
+      return FPBits::quiet_nan().get_val();
     }
     if (xbits.is_inf_or_nan()) {
       return x;
diff --git a/libc/src/math/generic/logf.cpp b/libc/src/math/generic/logf.cpp
index 4ad5a4e9b6ad..49d258ecc133 100644
--- a/libc/src/math/generic/logf.cpp
+++ b/libc/src/math/generic/logf.cpp
@@ -124,7 +124,7 @@ LLVM_LIBC_FUNCTION(float, logf, (float x)) {
         // Return NaN and raise FE_INVALID
         fputil::set_errno_if_required(EDOM);
         fputil::raise_except_if_required(FE_INVALID);
-        return FPBits::build_quiet_nan().get_val();
+        return FPBits::quiet_nan().get_val();
       }
       // x is +inf or nan
       return x;
diff --git a/libc/src/math/generic/powf.cpp b/libc/src/math/generic/powf.cpp
index 0e164ab8b422..2c666bab6d62 100644
--- a/libc/src/math/generic/powf.cpp
+++ b/libc/src/math/generic/powf.cpp
@@ -657,7 +657,7 @@ LLVM_LIBC_FUNCTION(float, powf, (float x, float y)) {
         // pow( negative, non-integer ) = NaN
         fputil::set_errno_if_required(EDOM);
         fputil::raise_except_if_required(FE_INVALID);
-        return FloatBits::build_quiet_nan().get_val();
+        return FloatBits::quiet_nan().get_val();
       }
     }
   }
diff --git a/libc/src/math/generic/sincosf.cpp b/libc/src/math/generic/sincosf.cpp
index 52f2323b4354..9ebf0b686896 100644
--- a/libc/src/math/generic/sincosf.cpp
+++ b/libc/src/math/generic/sincosf.cpp
@@ -148,7 +148,7 @@ LLVM_LIBC_FUNCTION(void, sincosf, (float x, float *sinp, float *cosp)) {
       fputil::set_errno_if_required(EDOM);
       fputil::raise_except_if_required(FE_INVALID);
     }
-    *sinp = FPBits::build_quiet_nan().get_val();
+    *sinp = FPBits::quiet_nan().get_val();
     *cosp = *sinp;
     return;
   }
diff --git a/libc/src/math/generic/sinf.cpp b/libc/src/math/generic/sinf.cpp
index 7ba479f0a459..ff555bcb1219 100644
--- a/libc/src/math/generic/sinf.cpp
+++ b/libc/src/math/generic/sinf.cpp
@@ -139,7 +139,7 @@ LLVM_LIBC_FUNCTION(float, sinf, (float x)) {
       fputil::set_errno_if_required(EDOM);
       fputil::raise_except_if_required(FE_INVALID);
     }
-    return x + FPBits::build_quiet_nan().get_val();
+    return x + FPBits::quiet_nan().get_val();
   }
 
   // Combine the results with the sine of sum formula:
diff --git a/libc/src/math/generic/tanf.cpp b/libc/src/math/generic/tanf.cpp
index 09dd62eae03f..b2882b57b29c 100644
--- a/libc/src/math/generic/tanf.cpp
+++ b/libc/src/math/generic/tanf.cpp
@@ -114,7 +114,7 @@ LLVM_LIBC_FUNCTION(float, tanf, (float x)) {
         fputil::set_errno_if_required(EDOM);
         fputil::raise_except_if_required(FE_INVALID);
       }
-      return x + FPBits::build_quiet_nan().get_val();
+      return x + FPBits::quiet_nan().get_val();
     }
     // Other large exceptional values
     if (auto r = TANF_EXCEPTS.lookup_odd(x_abs, x_sign);
diff --git a/libc/test/UnitTest/FPMatcher.h b/libc/test/UnitTest/FPMatcher.h
index 7c81475ecec3..210690a9c6ec 100644
--- a/libc/test/UnitTest/FPMatcher.h
+++ b/libc/test/UnitTest/FPMatcher.h
@@ -68,8 +68,8 @@ template <typename T> struct FPTest : public Test {
       LIBC_NAMESPACE::cpp::numeric_limits<StorageType>::max();
   static constexpr T zero = FPBits::zero(Sign::POS).get_val();
   static constexpr T neg_zero = FPBits::zero(Sign::NEG).get_val();
-  static constexpr T aNaN = FPBits::build_quiet_nan().get_val();
-  static constexpr T sNaN = FPBits::build_nan().get_val();
+  static constexpr T aNaN = FPBits::quiet_nan().get_val();
+  static constexpr T sNaN = FPBits::signaling_nan().get_val();
   static constexpr T inf = FPBits::inf(Sign::POS).get_val();
   static constexpr T neg_inf = FPBits::inf(Sign::NEG).get_val();
   static constexpr T min_normal = FPBits::min_normal().get_val();
@@ -97,8 +97,8 @@ template <typename T> struct FPTest : public Test {
       LIBC_NAMESPACE::cpp::numeric_limits<StorageType>::max();                 \
   const T zero = FPBits::zero(Sign::POS).get_val();                            \
   const T neg_zero = FPBits::zero(Sign::NEG).get_val();                        \
-  const T aNaN = FPBits::build_quiet_nan().get_val();                          \
-  const T sNaN = FPBits::build_nan().get_val();                                \
+  const T aNaN = FPBits::quiet_nan().get_val();                                \
+  const T sNaN = FPBits::signaling_nan().get_val();                            \
   const T inf = FPBits::inf(Sign::POS).get_val();                              \
   const T neg_inf = FPBits::inf(Sign::NEG).get_val();                          \
   const T min_normal = FPBits::min_normal().get_val();                         \
diff --git a/libc/test/src/__support/FPUtil/fpbits_test.cpp b/libc/test/src/__support/FPUtil/fpbits_test.cpp
index 990c40614275..17737af9ce14 100644
--- a/libc/test/src/__support/FPUtil/fpbits_test.cpp
+++ b/libc/test/src/__support/FPUtil/fpbits_test.cpp
@@ -26,8 +26,8 @@ TEST(LlvmLibcFPBitsTest, FPType_IEEE754_Binary16) {
   EXPECT_EQ(u16(0b0'00001'0000000000), u16(Rep::min_normal()));
   EXPECT_EQ(u16(0b0'11110'1111111111), u16(Rep::max_normal()));
   EXPECT_EQ(u16(0b0'11111'0000000000), u16(Rep::inf()));
-  EXPECT_EQ(u16(0b0'11111'0100000000), u16(Rep::build_nan()));
-  EXPECT_EQ(u16(0b0'11111'1000000000), u16(Rep::build_quiet_nan()));
+  EXPECT_EQ(u16(0b0'11111'0100000000), u16(Rep::signaling_nan()));
+  EXPECT_EQ(u16(0b0'11111'1000000000), u16(Rep::quiet_nan()));
 }
 
 TEST(LlvmLibcFPBitsTest, FPType_IEEE754_Binary32) {
@@ -43,9 +43,9 @@ TEST(LlvmLibcFPBitsTest, FPType_IEEE754_Binary32) {
   EXPECT_EQ(u32(0b0'00000001'00000000000000000000000), u32(Rep::min_normal()));
   EXPECT_EQ(u32(0b0'11111110'11111111111111111111111), u32(Rep::max_normal()));
   EXPECT_EQ(u32(0b0'11111111'00000000000000000000000), u32(Rep::inf()));
-  EXPECT_EQ(u32(0b0'11111111'01000000000000000000000), u32(Rep::build_nan()));
-  EXPECT_EQ(u32(0b0'11111111'10000000000000000000000),
-            u32(Rep::build_quiet_nan()));
+  EXPECT_EQ(u32(0b0'11111111'01000000000000000000000),
+            u32(Rep::signaling_nan()));
+  EXPECT_EQ(u32(0b0'11111111'10000000000000000000000), u32(Rep::quiet_nan()));
 }
 
 TEST(LlvmLibcFPBitsTest, FPType_IEEE754_Binary64) {
@@ -75,10 +75,10 @@ TEST(LlvmLibcFPBitsTest, FPType_IEEE754_Binary64) {
       u64(Rep::inf()));
   EXPECT_EQ(
       u64(0b0'11111111111'0100000000000000000000000000000000000000000000000000),
-      u64(Rep::build_nan()));
+      u64(Rep::signaling_nan()));
   EXPECT_EQ(
       u64(0b0'11111111111'1000000000000000000000000000000000000000000000000000),
-      u64(Rep::build_quiet_nan()));
+      u64(Rep::quiet_nan()));
 }
 
 static constexpr UInt128 u128(uint64_t hi, uint64_t lo) {
@@ -123,11 +123,11 @@ TEST(LlvmLibcFPBitsTest, FPType_IEEE754_Binary128) {
   EXPECT_EQ(
       u128(0b0'111111111111111'010000000000000000000000000000000000000000000000,
            0b0000000000000000000000000000000000000000000000000000000000000000),
-      UInt128(Rep::build_nan()));
+      UInt128(Rep::signaling_nan()));
   EXPECT_EQ(
       u128(0b0'111111111111111'100000000000000000000000000000000000000000000000,
            0b0000000000000000000000000000000000000000000000000000000000000000),
-      UInt128(Rep::build_quiet_nan()));
+      UInt128(Rep::quiet_nan()));
 }
 
 TEST(LlvmLibcFPBitsTest, FPType_X86_Binary80) {
@@ -164,11 +164,11 @@ TEST(LlvmLibcFPBitsTest, FPType_X86_Binary80) {
   EXPECT_EQ(
       u128(0b0'111111111111111,
            0b1010000000000000000000000000000000000000000000000000000000000000),
-      UInt128(Rep::build_nan()));
+      UInt128(Rep::signaling_nan()));
   EXPECT_EQ(
       u128(0b0'111111111111111,
            0b1100000000000000000000000000000000000000000000000000000000000000),
-      UInt128(Rep::build_quiet_nan()));
+      UInt128(Rep::quiet_nan()));
 }
 
 TEST(LlvmLibcFPBitsTest, FPTy...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/79998


More information about the libc-commits mailing list