Replace unsafe_isdefined with isassigned (#170)

This is the standard API
JuliaIO · Dec 21, 2019 · 480fb30 · 480fb30 · timholy · Dec 21, 2019
1 parent 0efdde2
commit 480fb30
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/dataio.jl b/src/dataio.jl
@@ -174,7 +174,7 @@ function write_data(io::MmapIO, f::JLDFile, data::Array{T}, odr::S, ::HasReferen
     cp = IndirectPointer(io, p)
 
     for i = 1:length(data)
-        if (isconcretetype(T) && isbitstype(T)) || unsafe_isdefined(data, i)
+        if isassigned(data, i)
             @inbounds h5convert!(cp, odr, f, data[i], wsession)
         else
             @inbounds h5convert_uninitialized!(cp, odr)
@@ -261,7 +261,7 @@ function write_data(io::BufferedWriter, f::JLDFile, data::Array{T}, odr::S,
     position = io.position[]
     cp = Ptr{Cvoid}(pointer(io.buffer, position+1))
     @simd for i = 1:length(data)
-        if (isconcretetype(T) && isbitstype(T)) || unsafe_isdefined(data, i)
+        if isassigned(data, i)
             @inbounds h5convert!(cp, odr, f, data[i], wsession)
         else
             @inbounds h5convert_uninitialized!(cp, odr)
@@ -279,7 +279,7 @@ function write_data(io::IOStream, f::JLDFile, data::Array{T}, odr::S, wm::DataMo
     pos = position(io)
     cp = Ptr{Cvoid}(pointer(buf))
     @simd for i = 1:length(data)
-        if (isconcretetype(T) && isbitstype(T)) || unsafe_isdefined(data, i)
+        if isassigned(data, i)
             @inbounds h5convert!(cp, odr, f, data[i], wsession)
         else
             @inbounds h5convert_uninitialized!(cp, odr)

diff --git a/src/datasets.jl b/src/datasets.jl
@@ -333,10 +333,6 @@ function payload_size_without_storage_message(dataspace::WriteDataspace, datatyp
     sz
 end
 
-# Like isdefined, but assumes arr is a pointer array, and can be inlined
-unsafe_isdefined(arr::Array, i::Int) =
-    unsafe_load(Ptr{Ptr{Cvoid}}(pointer(arr)+(i-1)*sizeof(Ptr{Cvoid}))) != Ptr{Cvoid}(0)
-
 function deflate_data(f::JLDFile, data::Array{T}, odr::S, wsession::JLDWriteSession) where {T,S}
     buf = Vector{UInt8}(undef, odr_sizeof(odr) * length(data))
     cp = Ptr{Cvoid}(pointer(buf))