Skip to content

Commit 73c1eeb

Browse files
authored
fix rem2pi for non-finite arguments (#46163)
1 parent 69e319d commit 73c1eeb

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

base/math.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ julia> rem2pi(7pi/4, RoundDown)
12391239
"""
12401240
function rem2pi end
12411241
function rem2pi(x::Float64, ::RoundingMode{:Nearest})
1242-
isnan(x) && return NaN
1242+
isfinite(x) || return NaN
12431243

12441244
abs(x) < pi && return x
12451245

@@ -1264,7 +1264,7 @@ function rem2pi(x::Float64, ::RoundingMode{:Nearest})
12641264
end
12651265
end
12661266
function rem2pi(x::Float64, ::RoundingMode{:ToZero})
1267-
isnan(x) && return NaN
1267+
isfinite(x) || return NaN
12681268

12691269
ax = abs(x)
12701270
ax <= 2*Float64(pi,RoundDown) && return x
@@ -1291,7 +1291,7 @@ function rem2pi(x::Float64, ::RoundingMode{:ToZero})
12911291
copysign(z,x)
12921292
end
12931293
function rem2pi(x::Float64, ::RoundingMode{:Down})
1294-
isnan(x) && return NaN
1294+
isfinite(x) || return NaN
12951295

12961296
if x < pi4o2_h
12971297
if x >= 0
@@ -1322,7 +1322,7 @@ function rem2pi(x::Float64, ::RoundingMode{:Down})
13221322
end
13231323
end
13241324
function rem2pi(x::Float64, ::RoundingMode{:Up})
1325-
isnan(x) && return NaN
1325+
isfinite(x) || return NaN
13261326

13271327
if x > -pi4o2_h
13281328
if x <= 0

test/numbers.jl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2676,10 +2676,12 @@ end
26762676
end
26772677

26782678
@testset "PR #36420 $T" for T in (Float16, Float32, Float64)
2679-
@test rem2pi(T(NaN), RoundToZero) === T(NaN)
2680-
@test rem2pi(T(NaN), RoundNearest) === T(NaN)
2681-
@test rem2pi(T(NaN), RoundDown) === T(NaN)
2682-
@test rem2pi(T(NaN), RoundUp) === T(NaN)
2679+
for r in (RoundToZero, RoundNearest, RoundDown, RoundUp)
2680+
for x in (Inf, -Inf, NaN, -NaN)
2681+
@test isnan(rem2pi(T(x), r))
2682+
@test rem2pi(T(x), r) isa T
2683+
end
2684+
end
26832685
end
26842686

26852687
import Base.^

0 commit comments

Comments
 (0)