call convert in Base.setfield! (fixes JuliaLang#16195)

stevengj · May 27, 2016 · 56d5306 · 56d5306
1 parent 9201324
commit 56d5306
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/base/base.jl b/base/base.jl
@@ -107,3 +107,5 @@ immutable Nullable{T}
     Nullable() = new(true)
     Nullable(value::T, isnull::Bool=false) = new(isnull, value)
 end
+
+setfield!{T}(x::T, i, v) = Core.setfield!(x, i, convert(fieldtype(T, i), v))
diff --git a/base/boot.jl b/base/boot.jl
@@ -136,7 +136,7 @@ export
     Expr, GotoNode, LabelNode, LineNumberNode, QuoteNode,
     GlobalRef, NewvarNode, SSAValue, Slot, SlotNumber, TypedSlot,
     # object model functions
-    fieldtype, getfield, setfield!, nfields, throw, tuple, is, ===, isdefined, eval,
+    fieldtype, getfield, nfields, throw, tuple, is, ===, isdefined, eval,
     # sizeof    # not exported, to avoid conflicting with Base.sizeof
     # type reflection
     issubtype, typeof, isa,

diff --git a/base/coreimg.jl b/base/coreimg.jl
@@ -2,6 +2,7 @@
 
 Main.Core.eval(Main.Core, :(baremodule Inference
 using Core.TopModule, Core.Intrinsics
+import Core.setfield!
 ccall(:jl_set_istopmod, Void, (Bool,), false)
 
 eval(x) = Core.eval(Inference,x)

diff --git a/base/exports.jl b/base/exports.jl
@@ -1039,6 +1039,7 @@ export
     promote,
     promote_rule,
     promote_type,
+    setfield!,
     subtypes,
     instances,
     supertype,

diff --git a/base/serialize.jl b/base/serialize.jl
@@ -773,7 +773,7 @@ function deserialize(s::SerializationState, ::Type{TypeName})
         ccall(:jl_set_const, Void, (Any, Any, Any), mod, name, ty)
         if !isdefined(ty,:instance)
             if isempty(parameters) && !abstr && size == 0 && (!mutable || isempty(names))
-                setfield!(ty, :instance, ccall(:jl_new_struct, Any, (Any,Any...), ty))
+                Core.setfield!(ty, :instance, ccall(:jl_new_struct, Any, (Any,Any...), ty))
             end
         end
     end

diff --git a/test/core.jl b/test/core.jl
@@ -847,7 +847,7 @@ let
     @test_throws BoundsError getfield(z, 3)
 
     strct = LoadError("", 0, "")
-    setfield!(strct, 2, 8)
+    setfield!(strct, 2, 8.0)
     @test strct.line == 8
     setfield!(strct, 3, "hi")
     @test strct.error == "hi"