Merge pull request #184 from maleadt/tb/personality

Fix personality function handling

Author: maleadt

.gitlab-ci.yml

@@ -23,13 +23,16 @@ test:1.3:
   extends:
     - .julia:1.3
     - .test
-  allow_failure: true
 
 test:1.4:
   extends:
     - .julia:1.4
     - .test
-  allow_failure: true
+
+test:1.5:
+  extends:
+    - .julia:1.4
+    - .test
 
 test:nightly:
   extends:

.travis.yml

@@ -10,6 +10,7 @@ julia:
   - 1.2
   - 1.3
   - 1.4
+  - 1.5
   - nightly
 
 notifications:
@@ -26,3 +27,5 @@ jobs:
                                                Pkg.instantiate()'
         - julia --project=docs/ docs/make.jl
       after_success: skip
+  allow_failures:
+    - julia: nightly

src/core/function.jl

@@ -12,8 +12,12 @@ Function(mod::Module, name::String, ft::FunctionType) =
 
 unsafe_delete!(::Module, f::Function) = API.LLVMDeleteFunction(ref(f))
 
-personality(f::Function) = Function(API.LLVMGetPersonalityFn(ref(f)))
-personality!(f::Function, persfn::Function) = API.LLVMSetPersonalityFn(ref(f), ref(persfn))
+function personality(f::Function)
+    has_personality = convert(Core.Bool, API.LLVMHasPersonalityFn(ref(f)))
+    return has_personality ? Function(API.LLVMGetPersonalityFn(ref(f))) : nothing
+end
+personality!(f::Function, persfn::Union{Nothing,Function}) =
+    API.LLVMSetPersonalityFn(ref(f), persfn===nothing ? C_NULL : ref(persfn))
 
 intrinsic_id(f::Function) = API.LLVMGetIntrinsicID(ref(f))
 

src/core/type.jl

@@ -98,7 +98,8 @@ export isvararg, return_type, parameters
 end
 identify(::Type{LLVMType}, ::Val{API.LLVMFunctionTypeKind}) = FunctionType
 
-FunctionType(rettyp::LLVMType, params::Vector{T}=LLVMType[], vararg::Core.Bool=false) where {T<:LLVMType} =
+FunctionType(rettyp::LLVMType, params::Vector{T}=LLVMType[];
+             vararg::Core.Bool=false) where {T<:LLVMType} =
     FunctionType(API.LLVMFunctionType(ref(rettyp), ref.(params),
                                       length(params), convert(Bool, vararg)))
 

src/deprecated.jl

@@ -3,3 +3,5 @@
 import Base: get
 
 @deprecate get(set::TargetSet, name::String) getindex(set, name)
+
+@deprecate FunctionType(rettyp, params, vararg) FunctionType(rettyp, params; vararg=vararg)

test/core.jl

@@ -669,7 +669,14 @@ LLVM.Module("SomeModule", ctx) do mod
 
     show(devnull, fn)
 
-    # @show personality(fn)
+    @test personality(fn) === nothing
+    pers_ft = LLVM.FunctionType(LLVM.Int32Type(ctx); vararg=true)
+    pers_fn = LLVM.Function(mod, "PersonalityFunction", ft)
+    personality!(fn, pers_fn)
+    @test personality(fn) == pers_fn
+    personality!(fn, nothing)
+    @test personality(fn) === nothing
+    unsafe_delete!(mod, pers_fn)
 
     @test intrinsic_id(fn) == 0