Replaces checked_fptosi/checked_fptoui intrinsics with Julia implemen…

…tations. Fixes #14549.

base/float.jl

@@ -602,16 +602,29 @@ for Ti in (Int8, Int16, Int32, Int64, Int128, UInt8, UInt16, UInt32, UInt64, UIn
                 $(Tf(typemin(Ti))-one(Tf)) < x < $(Tf(typemax(Ti))+one(Tf)) || throw(InexactError())
                 unsafe_trunc($Ti,x)
             end
-        else
+            @eval function convert(::Type{$Ti}, x::$Tf)
+                if ($(Tf(typemin(Ti))) <= x <= $(Tf(typemax(Ti)))) && (trunc(x) == x)
+                    return unsafe_trunc($Ti,x)
+                else
+                    throw(InexactError())
+                end
+            end
+        else #
             @eval function trunc(::Type{$Ti},x::$Tf)
                 $(Tf(typemin(Ti))) <= x < $(Tf(typemax(Ti))) || throw(InexactError())
                 unsafe_trunc($Ti,x)
             end
+            @eval function convert(::Type{$Ti}, x::$Tf)
+                if ($(Tf(typemin(Ti))) <= x < $(Tf(typemax(Ti)))) && (trunc(x) == x)
+                    return unsafe_trunc($Ti,x)
+                else
+                    throw(InexactError())
+                end
+            end
         end
     end
 end
 
-
 @eval begin
     issubnormal(x::Float32) = (abs(x) < $(box(Float32,unbox(UInt32,0x00800000)))) & (x!=0)
     issubnormal(x::Float64) = (abs(x) < $(box(Float64,unbox(UInt64,0x0010000000000000)))) & (x!=0)

base/int.jl

@@ -328,16 +328,6 @@ rem(x::Integer, ::Type{Bool}) = ((x&1)!=0)
 mod{T<:Integer}(x::Integer, ::Type{T}) = rem(x, T)
 
 unsafe_trunc{T<:Integer}(::Type{T}, x::Integer) = rem(x, T)
-
-convert{Tf<:Union{Float32,Float64}}(T::BitSigned64T, x::Tf) =
-    box(T,checked_fptosi(T,unbox(Tf,x)))
-convert{Tf<:Union{Float32,Float64}}(T::BitUnsigned64T, x::Tf) =
-    box(T,checked_fptoui(T,unbox(Tf,x)))
-
-convert{Tf<:Union{Float32,Float64}}(T::Union{Type{Int128},Type{UInt128}}, x::Tf) =
-    (isinteger(x) || throw(InexactError()) ; trunc(T,x))
-convert(T::Union{Type{Int128},Type{UInt128}},  x::Float16) = convert(T, Float32(x))
-
 for (Ts, Tu) in ((Int8, UInt8), (Int16, UInt16), (Int32, UInt32), (Int64, UInt64), (Int128, UInt128))
     @eval convert(::Type{Signed}, x::$Tu) = convert($Ts, x)
     @eval convert(::Type{Unsigned}, x::$Ts) = convert($Tu, x)

src/intrinsics.cpp

@@ -653,80 +653,6 @@ static jl_cgval_t generic_zext(jl_value_t *targ, jl_value_t *x, jl_codectx_t *ct
     return mark_julia_type(ans, false, jlto, ctx);
 }
 
-static Value *emit_eqfsi(Value *x, Value *y)
-{
-    Value *fy = JL_INT(y);
-
-    // using all 64-bit is slightly faster than using mixed sizes
-    Value *xx = x, *vv = fy;
-    if (x->getType() == T_float32)
-        xx = builder.CreateFPExt(xx, T_float64);
-    if (vv->getType()->getPrimitiveSizeInBits() < 64)
-        vv = builder.CreateSExt(vv, T_int64);
-
-    Value *back = builder.CreateSIToFP(vv, xx->getType());
-    return builder.CreateAnd
-        (builder.CreateFCmpOEQ(xx, back),
-         builder.CreateICmpEQ(vv, builder.CreateFPToSI(back, vv->getType())));
-}
-
-static Value *emit_eqfui(Value *x, Value *y)
-{
-    Value *fy = JL_INT(y);
-
-    // using all 64-bit is slightly faster than using mixed sizes
-    Value *xx = x, *vv = fy;
-    if (x->getType() == T_float32)
-        xx = builder.CreateFPExt(xx, T_float64);
-    if (vv->getType()->getPrimitiveSizeInBits() < 64)
-        vv = builder.CreateZExt(vv, T_int64);
-
-    Value *back = builder.CreateUIToFP(vv, xx->getType());
-    return builder.CreateAnd
-        (builder.CreateFCmpOEQ(xx, back),
-         builder.CreateICmpEQ(vv, builder.CreateFPToUI(back, vv->getType())));
-}
-
-static jl_cgval_t emit_checked_fptosi(jl_value_t *targ, jl_value_t *x, jl_codectx_t *ctx)
-{
-    jl_value_t *jlto = staticeval_bitstype(targ, "checked_fptosi", ctx);
-    if (!jlto) return jl_cgval_t();
-    Type *to = staticeval_bitstype(jlto);
-    Value *fx = FP(auto_unbox(x, ctx));
-    if (fx->getType() == T_void) return jl_cgval_t(); // auto_unbox threw an error
-    Value *ans = builder.CreateFPToSI(fx, to);
-    if (fx->getType() == T_float32 && to == T_int32) {
-        raise_exception_unless
-            (builder.CreateFCmpOEQ(builder.CreateFPExt(fx, T_float64),
-                                   builder.CreateSIToFP(ans, T_float64)),
-             literal_pointer_val(jl_inexact_exception), ctx);
-    }
-    else {
-        raise_exception_unless(emit_eqfsi(fx, ans), literal_pointer_val(jl_inexact_exception), ctx);
-    }
-    return mark_julia_type(ans, false, jlto, ctx);
-}
-
-static jl_cgval_t emit_checked_fptoui(jl_value_t *targ, jl_value_t *x, jl_codectx_t *ctx)
-{
-    jl_value_t *jlto = staticeval_bitstype(targ, "checked_fptoui", ctx);
-    if (!jlto) return jl_cgval_t();
-    Type *to = staticeval_bitstype(jlto);
-    Value *fx = FP(auto_unbox(x, ctx));
-    if (fx->getType() == T_void) return jl_cgval_t(); // auto_unbox threw an error
-    Value *ans = builder.CreateFPToUI(fx, to);
-    if (fx->getType() == T_float32 && to == T_int32) {
-        raise_exception_unless
-            (builder.CreateFCmpOEQ(builder.CreateFPExt(fx, T_float64),
-                                   builder.CreateUIToFP(ans, T_float64)),
-             literal_pointer_val(jl_inexact_exception), ctx);
-    }
-    else {
-        raise_exception_unless(emit_eqfui(fx, ans), literal_pointer_val(jl_inexact_exception), ctx);
-    }
-    return mark_julia_type(ans, false, jlto, ctx);
-}
-
 static jl_cgval_t emit_runtime_pointerref(jl_value_t *e, jl_value_t *i, jl_value_t *align, jl_codectx_t *ctx)
 {
     jl_cgval_t parg = emit_expr(e, ctx);
@@ -992,10 +918,6 @@ static jl_cgval_t emit_intrinsic(intrinsic f, jl_value_t **args, size_t nargs,
         return generic_sext(args[1], args[2], ctx);
     case zext_int:
         return generic_zext(args[1], args[2], ctx);
-    case checked_fptosi:
-        return emit_checked_fptosi(args[1], args[2], ctx);
-    case checked_fptoui:
-        return emit_checked_fptoui(args[1], args[2], ctx);
 
     case uitofp: {
         jl_value_t *bt = staticeval_bitstype(args[1], "uitofp", ctx);

src/intrinsics.h

@@ -68,8 +68,6 @@
     ADD_I(fptrunc, 2) \
     ADD_I(fpext, 2) \
     /*  checked conversion */ \
-    ADD_I(checked_fptosi, 2) \
-    ADD_I(checked_fptoui, 2) \
     ADD_I(checked_trunc_sint, 2) \
     ADD_I(checked_trunc_uint, 2) \
     ADD_I(check_top_bit, 1) \

src/julia_internal.h

@@ -647,8 +647,6 @@ JL_DLLEXPORT jl_value_t *jl_fpext(jl_value_t *ty, jl_value_t *a);
 JL_DLLEXPORT jl_value_t *jl_fptoui_auto(jl_value_t *a);
 JL_DLLEXPORT jl_value_t *jl_fptosi_auto(jl_value_t *a);
 
-JL_DLLEXPORT jl_value_t *jl_checked_fptoui(jl_value_t *ty, jl_value_t *a);
-JL_DLLEXPORT jl_value_t *jl_checked_fptosi(jl_value_t *ty, jl_value_t *a);
 JL_DLLEXPORT jl_value_t *jl_checked_trunc_sint(jl_value_t *ty, jl_value_t *a);
 JL_DLLEXPORT jl_value_t *jl_checked_trunc_uint(jl_value_t *ty, jl_value_t *a);
 

src/runtime_intrinsics.c

@@ -876,15 +876,6 @@ static unsigned check_trunc_uint(unsigned isize, unsigned osize, void *pa)
 }
 cvt_iintrinsic_checked(LLVMTrunc, check_trunc_uint, checked_trunc_uint)
 
-#define checked_fptosi(pr, a) \
-        if (!LLVMFPtoSI_exact(sizeof(a) * host_char_bit, pa, osize, pr)) \
-            jl_throw(jl_inexact_exception);
-un_fintrinsic_withtype(checked_fptosi, checked_fptosi)
-#define checked_fptoui(pr, a) \
-        if (!LLVMFPtoUI_exact(sizeof(a) * host_char_bit, pa, osize, pr)) \
-            jl_throw(jl_inexact_exception);
-un_fintrinsic_withtype(checked_fptoui, checked_fptoui)
-
 JL_DLLEXPORT jl_value_t *jl_check_top_bit(jl_value_t *a)
 {
     jl_value_t *ty = jl_typeof(a);

test/numbers.jl

@@ -2458,6 +2458,13 @@ end
 @test_throws InexactError convert(Int16, typemax(UInt64))
 @test_throws InexactError convert(Int, typemax(UInt64))
 
+# issue #14549
+for T in (Int8, Int16, UInt8, UInt16)
+    for F in (Float32,Float64)
+        @test_throws InexactError convert(T, F(200000.0))
+    end
+end
+
 let x = big(-0.0)
     @test signbit(x) && !signbit(abs(x))
 end