Skip to content

Commit a0af124

Browse files
author
oscarddssmith
committed
address review
1 parent 3402a7e commit a0af124

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

base/math.jl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -831,13 +831,11 @@ min(x::T, y::T) where {T<:AbstractFloat} = isnan(x) || ~isnan(y) && _isless(x, y
831831
max(x::T, y::T) where {T<:AbstractFloat} = isnan(x) || ~isnan(y) && _isless(y, x) ? x : y
832832
minmax(x::T, y::T) where {T<:AbstractFloat} = min(x, y), max(x, y)
833833

834-
_isless(x::Float16, y::Float16) = signbit(widen(x) - widen(y))
835-
836-
function min(x::T, y::T) where {T<:Union{Float16,Float32,Float64}}
834+
function min(x::T, y::T) where {T<:IEEEFloat}
837835
return min_float(x, y)
838836
end
839837

840-
function max(x::T, y::T) where {T<:Union{Float16,Float32,Float64}}
838+
function max(x::T, y::T) where {T<:IEEEFloat}
841839
return max_float(x, y)
842840
end
843841

src/runtime_intrinsics.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1404,15 +1404,15 @@ bi_fintrinsic(sub,sub_float)
14041404
bi_fintrinsic(mul,mul_float)
14051405
bi_fintrinsic(div,div_float)
14061406

1407-
float min_float(float x, float y)
1407+
float min_float(float x, float y) JL_NOTSAFEPOINT
14081408
{
14091409
float diff = x - y;
14101410
float argmin = signbit(diff) ? x : y;
14111411
int is_nan = isnan(x) || isnan(y);
14121412
return is_nan ? diff : argmin;
14131413
}
14141414

1415-
double min_double(double x, double y)
1415+
double min_double(double x, double y) JL_NOTSAFEPOINT
14161416
{
14171417
double diff = x - y;
14181418
double argmin = signbit(diff) ? x : y;
@@ -1423,15 +1423,15 @@ double min_double(double x, double y)
14231423
#define _min(a, b) sizeof(a) == sizeof(float) ? min_float(a, b) : min_double(a, b)
14241424
bi_fintrinsic(_min, min_float)
14251425

1426-
float max_float(float x, float y)
1426+
float max_float(float x, float y) JL_NOTSAFEPOINT
14271427
{
14281428
float diff = x - y;
14291429
float argmin = signbit(diff) ? y : x;
14301430
int is_nan = isnan(x) || isnan(y);
14311431
return is_nan ? diff : argmin;
14321432
}
14331433

1434-
double max_double(double x, double y)
1434+
double max_double(double x, double y) JL_NOTSAFEPOINT
14351435
{
14361436
double diff = x - y;
14371437
double argmin = signbit(diff) ? x : y;

0 commit comments

Comments
 (0)