Merge pull request #175 from maleadt/tb/dispose_messages

Properly dispose of messages to avoid memory leaks.

Author: maleadt

src/LLVM.jl

@@ -85,7 +85,7 @@ end
 
 ## source code includes
 
-include("util/types.jl")
+include("util.jl")
 
 include("base.jl")
 

src/core/context.jl

@@ -50,7 +50,7 @@ end
 reftype(::Type{DiagnosticInfo}) = API.LLVMDiagnosticInfoRef
 
 severity(di::DiagnosticInfo) = API.LLVMGetDiagInfoSeverity(ref(di))
-message(di::DiagnosticInfo) = unsafe_string(API.LLVMGetDiagInfoDescription(ref(di)))
+message(di::DiagnosticInfo) = unsafe_message(API.LLVMGetDiagInfoDescription(ref(di)))
 
 
 ## handlers

src/core/module.jl

@@ -31,7 +31,7 @@ function Module(f::Core.Function, args...)
 end
 
 function Base.show(io::IO, mod::Module)
-    output = unsafe_string(API.LLVMPrintModuleToString(ref(mod)))
+    output = unsafe_message(API.LLVMPrintModuleToString(ref(mod)))
     print(io, output)
 end
 

src/core/type.jl

@@ -29,7 +29,7 @@ issized(typ::LLVMType) =
 context(typ::LLVMType) = Context(API.LLVMGetTypeContext(ref(typ)))
 
 function Base.show(io::IO, typ::LLVMType)
-    output = unsafe_string(API.LLVMPrintTypeToString(ref(typ)))
+    output = unsafe_message(API.LLVMPrintTypeToString(ref(typ)))
     print(io, output)
 end
 

src/core/value.jl

@@ -39,7 +39,7 @@ name(val::Value) = unsafe_string(API.LLVMGetValueName(ref(val)))
 name!(val::Value, name::String) = API.LLVMSetValueName(ref(val), name)
 
 function Base.show(io::IO, val::Value)
-    output = unsafe_string(API.LLVMPrintValueToString(ref(val)))
+    output = unsafe_message(API.LLVMPrintValueToString(ref(val)))
     print(io, output)
 end
 

src/datalayout.jl

@@ -25,7 +25,7 @@ end
 dispose(data::DataLayout) = API.LLVMDisposeTargetData(ref(data))
 
 Base.convert(::Type{String}, data::DataLayout) =
-    unsafe_string(API.LLVMCopyStringRepOfTargetData(ref(data)))
+    unsafe_message(API.LLVMCopyStringRepOfTargetData(ref(data)))
 
 function Base.show(io::IO, data::DataLayout)
     @printf(io, "DataLayout(%s)", convert(String, data))

src/target.jl

@@ -15,8 +15,7 @@ function Target(triple::String)
     status = convert(Core.Bool, API.LLVMGetTargetFromTriple(triple, out_ref, out_error))
 
     if status
-        error = unsafe_string(out_error[])
-        API.LLVMDisposeMessage(out_error[])
+        error = unsafe_message(out_error[])
         throw(LLVMException(error))
     end
 

src/targetmachine.jl

@@ -28,24 +28,23 @@ function TargetMachine(f::Core.Function, args...)
 end
 
 target(tm::TargetMachine) = Target(API.LLVMGetTargetMachineTarget(ref(tm)))
-triple(tm::TargetMachine) = unsafe_string(API.LLVMGetTargetMachineTriple(ref(tm)))
-triple() = unsafe_string(API.LLVMGetDefaultTargetTriple())
-cpu(tm::TargetMachine) = unsafe_string(API.LLVMGetTargetMachineCPU(ref(tm)))
-features(tm::TargetMachine) = unsafe_string(API.LLVMGetTargetMachineFeatureString(ref(tm)))
+triple(tm::TargetMachine) = unsafe_message(API.LLVMGetTargetMachineTriple(ref(tm)))
+triple() = unsafe_message(API.LLVMGetDefaultTargetTriple())
+cpu(tm::TargetMachine) = unsafe_message(API.LLVMGetTargetMachineCPU(ref(tm)))
+features(tm::TargetMachine) = unsafe_message(API.LLVMGetTargetMachineFeatureString(ref(tm)))
 
 asm_verbosity!(tm::TargetMachine, verbose::Core.Bool) =
     API.LLVMSetTargetMachineAsmVerbosity(ref(tm), convert(Bool, verbose))
 
 function emit(tm::TargetMachine, mod::Module, filetype::API.LLVMCodeGenFileType)
     out_error = Ref{Cstring}()
     out_membuf = Ref{API.LLVMMemoryBufferRef}()
-    status = convert(Core.Bool, 
+    status = convert(Core.Bool,
         API.LLVMTargetMachineEmitToMemoryBuffer(ref(tm), ref(mod), filetype,
                                                 out_error, out_membuf))
 
     if status
-        error = unsafe_string(out_error[])
-        API.LLVMDisposeMessage(out_error[])
+        error = unsafe_message(out_error[])
         throw(LLVMException(error))
     end
 
@@ -54,12 +53,11 @@ end
 
 function emit(tm::TargetMachine, mod::Module, filetype::API.LLVMCodeGenFileType, path::String)
     out_error = Ref{Cstring}()
-    status = convert(Core.Bool, 
+    status = convert(Core.Bool,
         API.LLVMTargetMachineEmitToFile(ref(tm), ref(mod), path, filetype, out_error))
 
     if status
-        error = unsafe_string(out_error[])
-        API.LLVMDisposeMessage(out_error[])
+        error = unsafe_message(out_error[])
         throw(LLVMException(error))
     end
 

src/util/types.jl renamed to src/util.jl

@@ -1,4 +1,13 @@
-# Defining types in the LLVM type hierarchy
+# utilities
+
+function unsafe_message(ptr)
+    str = unsafe_string(ptr)
+    API.LLVMDisposeMessage(ptr)
+    str
+end
+
+
+## defining types in the LLVM type hierarchy
 
 # llvm.org/docs/doxygen/html/group__LLVMCSupportTypes.html
 

test/support.jl

@@ -19,4 +19,4 @@ close(out.in)
 
 end
 
-end
+end