Return the number of bytes written from 'write'. (#339)

Author: maleadt

src/bitcode.jl

@@ -15,11 +15,22 @@ Base.parse(::Type{Module}, data::Vector; ctx::Context) =
 
 ## writer
 
-Base.write(io::IOStream, mod::Module) =
-    API.LLVMWriteBitcodeToFD(mod, Cint(fd(io)), convert(Bool, false), convert(Bool, true))
-
 Base.convert(::Type{MemoryBuffer}, mod::Module) = MemoryBuffer(
     API.LLVMWriteBitcodeToMemoryBuffer(mod))
 
-Base.convert(::Type{Vector{T}}, mod::Module) where {T<:Union{UInt8,Int8}} =
-    convert(Vector{T}, convert(MemoryBuffer, mod))
+function Base.convert(::Type{Vector{T}}, mod::Module) where {T<:Union{UInt8,Int8}}
+    buf = convert(MemoryBuffer, mod)
+    vec = convert(Vector{T}, buf)
+    dispose(buf)
+    return vec
+end
+
+function Base.write(io::IOStream, mod::Module)
+    # XXX: can't use the LLVM API because it returns 0, not the number of bytes written
+    #API.LLVMWriteBitcodeToFD(mod, Cint(fd(io)), convert(Bool, false), convert(Bool, true))
+    buf = convert(MemoryBuffer, mod)
+    vec = unsafe_wrap(Array, pointer(buf), length(buf))
+    nb = write(io, vec)
+    dispose(buf)
+    return nb
+end

src/buffer.jl

@@ -57,4 +57,4 @@ Base.length(membuf::MemoryBuffer) = API.LLVMGetBufferSize(membuf)
 Base.pointer(membuf::MemoryBuffer) = convert(Ptr{UInt8}, API.LLVMGetBufferStart(membuf))
 
 Base.convert(::Type{Vector{UInt8}}, membuf::MemoryBuffer) =
-    unsafe_wrap(Array, pointer(membuf), length(membuf))
+    copy(unsafe_wrap(Array, pointer(membuf), length(membuf)))

test/bitcode.jl

@@ -38,7 +38,7 @@ end
 
     mktemp() do path, io
         mark(io)
-        write(io, source_mod)
+        @test write(io, source_mod) > 0
         flush(io)
         reset(io)