Skip to content

[libc][math] Fix subtraction of infinity in fputil::add_or_sub #152017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions libc/src/__support/FPUtil/generic/add_sub.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,12 @@ add_or_sub(InType x, InType y) {
return OutFPBits::inf(x_bits.sign()).get_val();
}

if (y_bits.is_inf())
return OutFPBits::inf(y_bits.sign()).get_val();
if (y_bits.is_inf()) {
if constexpr (IsSub)
return OutFPBits::inf(y_bits.sign().negate()).get_val();
else
return OutFPBits::inf(y_bits.sign()).get_val();
}

if (x_bits.is_zero()) {
if (y_bits.is_zero()) {
Expand Down
4 changes: 4 additions & 0 deletions libc/test/src/math/smoke/AddTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ class AddTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
EXPECT_FP_EQ(neg_inf, func(in.neg_inf, in.zero));
EXPECT_FP_EQ(inf, func(in.inf, in.neg_zero));
EXPECT_FP_EQ(neg_inf, func(in.neg_inf, in.neg_zero));
EXPECT_FP_EQ(inf, func(in.zero, in.inf));
EXPECT_FP_EQ(inf, func(in.neg_zero, in.inf));
EXPECT_FP_EQ(neg_inf, func(in.zero, in.neg_inf));
EXPECT_FP_EQ(neg_inf, func(in.neg_zero, in.neg_inf));
}

void test_invalid_operations(AddFunc func) {
Expand Down
4 changes: 4 additions & 0 deletions libc/test/src/math/smoke/SubTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ class SubTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
EXPECT_FP_EQ(neg_inf, func(in.neg_inf, in.zero));
EXPECT_FP_EQ(inf, func(in.inf, in.neg_zero));
EXPECT_FP_EQ(neg_inf, func(in.neg_inf, in.neg_zero));
EXPECT_FP_EQ(neg_inf, func(in.zero, in.inf));
EXPECT_FP_EQ(neg_inf, func(in.neg_zero, in.inf));
EXPECT_FP_EQ(inf, func(in.zero, in.neg_inf));
EXPECT_FP_EQ(inf, func(in.neg_zero, in.neg_inf));
}

void test_invalid_operations(SubFunc func) {
Expand Down
Loading