Skip to content

Commit

Permalink
Remove last usage of build_nan
Browse files Browse the repository at this point in the history
  • Loading branch information
gchatelet committed Jan 29, 2024
1 parent 38af6a6 commit 2fdf373
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 26 deletions.
2 changes: 1 addition & 1 deletion libc/src/math/generic/asinf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 x + FPBits::build_nan().get_val();
return FPBits::build_quiet_nan().get_val();
}

// Check for exceptional values
Expand Down
2 changes: 1 addition & 1 deletion libc/src/math/generic/sincosf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 = x + FPBits::build_nan().get_val();
*sinp = FPBits::build_quiet_nan().get_val();
*cosp = *sinp;
return;
}
Expand Down
25 changes: 10 additions & 15 deletions libc/test/src/stdio/sprintf_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -586,9 +586,8 @@ TEST(LlvmLibcSPrintfTest, OctConv) {
TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
ForceRoundingMode r(RoundingMode::Nearest);
double inf = LIBC_NAMESPACE::fputil::FPBits<double>::inf().get_val();
double nan = LIBC_NAMESPACE::fputil::FPBits<double>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
double nan =
LIBC_NAMESPACE::fputil::FPBits<double>::build_quiet_nan().get_val();
written = LIBC_NAMESPACE::sprintf(buff, "%a", 1.0);
ASSERT_STREQ_LEN(written, buff, "0x1p+0");

Expand Down Expand Up @@ -952,14 +951,12 @@ TEST_F(LlvmLibcSPrintfTest, FloatHexExpConv) {
TEST_F(LlvmLibcSPrintfTest, FloatDecimalConv) {
ForceRoundingMode r(RoundingMode::Nearest);
double inf = LIBC_NAMESPACE::fputil::FPBits<double>::inf().get_val();
double nan = LIBC_NAMESPACE::fputil::FPBits<double>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
double nan =
LIBC_NAMESPACE::fputil::FPBits<double>::build_quiet_nan().get_val();
long double ld_inf =
LIBC_NAMESPACE::fputil::FPBits<long double>::inf().get_val();
long double ld_nan = LIBC_NAMESPACE::fputil::FPBits<long double>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
long double ld_nan =
LIBC_NAMESPACE::fputil::FPBits<long double>::build_quiet_nan().get_val();

char big_buff[10000]; // Used for long doubles and other extremely wide
// numbers.
Expand Down Expand Up @@ -1808,9 +1805,8 @@ TEST_F(LlvmLibcSPrintfTest, FloatDecimalLongDoubleConv) {
TEST_F(LlvmLibcSPrintfTest, FloatExponentConv) {
ForceRoundingMode r(RoundingMode::Nearest);
double inf = LIBC_NAMESPACE::fputil::FPBits<double>::inf().get_val();
double nan = LIBC_NAMESPACE::fputil::FPBits<double>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
double nan =
LIBC_NAMESPACE::fputil::FPBits<double>::build_quiet_nan().get_val();

written = LIBC_NAMESPACE::sprintf(buff, "%e", 1.0);
ASSERT_STREQ_LEN(written, buff, "1.000000e+00");
Expand Down Expand Up @@ -2417,9 +2413,8 @@ TEST_F(LlvmLibcSPrintfTest, FloatExponentLongDoubleConv) {
TEST_F(LlvmLibcSPrintfTest, FloatAutoConv) {
ForceRoundingMode r(RoundingMode::Nearest);
double inf = LIBC_NAMESPACE::fputil::FPBits<double>::inf().get_val();
double nan = LIBC_NAMESPACE::fputil::FPBits<double>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
double nan =
LIBC_NAMESPACE::fputil::FPBits<double>::build_quiet_nan().get_val();

written = LIBC_NAMESPACE::sprintf(buff, "%g", 1.0);
ASSERT_STREQ_LEN(written, buff, "1");
Expand Down
15 changes: 6 additions & 9 deletions libc/test/src/stdio/sscanf_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,9 +231,8 @@ TEST(LlvmLibcSScanfTest, FloatConvSimple) {
float result = 0;

float inf = LIBC_NAMESPACE::fputil::FPBits<float>::inf().get_val();
float nan = LIBC_NAMESPACE::fputil::FPBits<float>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
float nan =
LIBC_NAMESPACE::fputil::FPBits<float>::build_quiet_nan().get_val();

ret_val = LIBC_NAMESPACE::sscanf("123", "%f", &result);
EXPECT_EQ(ret_val, 1);
Expand Down Expand Up @@ -297,9 +296,8 @@ TEST(LlvmLibcSScanfTest, FloatConvLengthModifier) {
long double ld_result = 0;

double d_inf = LIBC_NAMESPACE::fputil::FPBits<double>::inf().get_val();
long double ld_nan = LIBC_NAMESPACE::fputil::FPBits<long double>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
long double ld_nan =
LIBC_NAMESPACE::fputil::FPBits<long double>::build_quiet_nan().get_val();

ret_val = LIBC_NAMESPACE::sscanf("123", "%lf", &d_result);
EXPECT_EQ(ret_val, 1);
Expand Down Expand Up @@ -395,9 +393,8 @@ TEST(LlvmLibcSScanfTest, FloatConvComplexParsing) {
float result = 0;

float inf = LIBC_NAMESPACE::fputil::FPBits<float>::inf().get_val();
float nan = LIBC_NAMESPACE::fputil::FPBits<float>::build_nan(
LIBC_NAMESPACE::fputil::Sign::POS, 1)
.get_val();
float nan =
LIBC_NAMESPACE::fputil::FPBits<float>::build_quiet_nan().get_val();

ret_val = LIBC_NAMESPACE::sscanf("0x1.0e3", "%f", &result);
EXPECT_EQ(ret_val, 1);
Expand Down

0 comments on commit 2fdf373

Please sign in to comment.