Replace reftype lookup with hard-coded types.

maleadt · maleadt · commit 1cf66a5c561e · 2020-07-03T11:20:21.000+02:00
diff --git a/src/buffer.jl b/src/buffer.jl
@@ -3,7 +3,6 @@ export MemoryBuffer, MemoryBufferFile, dispose
 @checked struct MemoryBuffer
     ref::API.LLVMMemoryBufferRef
 end
-reftype(::Type{MemoryBuffer}) = API.LLVMMemoryBufferRef
 
 Base.unsafe_convert(::Type{API.LLVMMemoryBufferRef}, membuf::MemoryBuffer) = membuf.ref
 
diff --git a/src/core/attributes.jl b/src/core/attributes.jl
@@ -6,19 +6,18 @@ export Attribute,
        kind, value
 
 abstract type Attribute end
-reftype(::Type{T}) where {T<:Attribute} = API.LLVMAttributeRef
 
 Base.unsafe_convert(::Type{API.LLVMAttributeRef}, attr::Attribute) = attr.ref
 
 @checked struct EnumAttribute <: Attribute
-    ref::reftype(Attribute)
+    ref::API.LLVMAttributeRef
 end
 
 @checked struct StringAttribute <: Attribute
-    ref::reftype(Attribute)
+    ref::API.LLVMAttributeRef
 end
 
-# TODO: make @reftype's identify mechanism flexible enough to cover cases like this one,
+# TODO: make the identify mechanism flexible enough to cover cases like this one,
 #       and not only Value and Type
 
 function Attribute(ref::API.LLVMAttributeRef)
diff --git a/src/core/basicblock.jl b/src/core/basicblock.jl
@@ -3,7 +3,7 @@ export BasicBlock, unsafe_delete!,
        move_before, move_after
 
 @checked struct BasicBlock <: Value
-    ref::reftype(Value)
+    ref::API.LLVMValueRef
 end
 identify(::Type{Value}, ::Val{API.LLVMBasicBlockValueKind}) = BasicBlock
 
@@ -12,7 +12,7 @@ Base.unsafe_convert(::Type{API.LLVMBasicBlockRef}, bb::BasicBlock) = API.LLVMVal
 
 # forward declarations
 @checked struct Function <: GlobalObject
-    ref::reftype(GlobalObject)
+    ref::API.LLVMValueRef
 end
 
 BasicBlock(f::Function, name::String) =
diff --git a/src/core/context.jl b/src/core/context.jl
@@ -5,7 +5,6 @@ export Context, dispose, GlobalContext
 @checked struct Context
     ref::API.LLVMContextRef
 end
-reftype(::Type{Context}) = API.LLVMContextRef
 
 Base.unsafe_convert(::Type{API.LLVMContextRef}, ctx::Context) = ctx.ref
 
@@ -49,7 +48,6 @@ export DiagnosticInfo, severity, message
 @checked struct DiagnosticInfo
     ref::API.LLVMDiagnosticInfoRef
 end
-reftype(::Type{DiagnosticInfo}) = API.LLVMDiagnosticInfoRef
 
 Base.unsafe_convert(::Type{API.LLVMDiagnosticInfoRef}, di::DiagnosticInfo) = di.ref
 
diff --git a/src/core/function.jl b/src/core/function.jl
@@ -74,7 +74,7 @@ end
 export Argument, parameters
 
 @checked struct Argument <: Value
-    ref::reftype(Value)
+    ref::API.LLVMValueRef
 end
 identify(::Type{Value}, ::Val{API.LLVMArgumentValueKind}) = Argument
 
diff --git a/src/core/instructions.jl b/src/core/instructions.jl
@@ -95,8 +95,7 @@ Base.setindex!(md::InstructionMetadataDict, node::MetadataAsValue, kind::MD) =
     API.LLVMSetMetadata(md.inst, kind, node)
 
 Base.delete!(md::InstructionMetadataDict, kind::MD) =
-    API.LLVMSetMetadata(md.inst, kind,
-                        convert(reftype(MetadataAsValue), C_NULL))
+    API.LLVMSetMetadata(md.inst, kind, C_NULL)
 
 
 ## instruction types
@@ -116,7 +115,7 @@ for op in opcodes
     enum = Symbol(:LLVM, op)
     @eval begin
         @checked struct $typename <: Instruction
-            ref::reftype(Instruction)
+            ref::API.LLVMValueRef
         end
         identify(::Type{Instruction}, ::Val{API.$enum}) = $typename
     end
diff --git a/src/core/metadata.jl b/src/core/metadata.jl
@@ -1,7 +1,7 @@
 export MDString, MDNode, operands, Metadata
 
 @checked struct MetadataAsValue <: Value
-    ref::reftype(Value)
+    ref::API.LLVMValueRef
 end
 identify(::Type{Value}, ::Val{API.LLVMMetadataAsValueValueKind}) = MetadataAsValue
 
@@ -42,7 +42,6 @@ end
 @checked struct Metadata
     ref::API.LLVMMetadataRef
 end
-reftype(::Type{Metadata}) = API.LLVMMetadataRef
 
 Base.unsafe_convert(::Type{API.LLVMMetadataRef}, md::Metadata) = md.ref
 
diff --git a/src/core/module.jl b/src/core/module.jl
@@ -8,7 +8,6 @@ export dispose,
        set_used!, set_compiler_used!
 
 # forward definition of Module in src/core/value/constant.jl
-reftype(::Type{Module}) = API.LLVMModuleRef
 
 Base.unsafe_convert(::Type{API.LLVMModuleRef}, mod::Module) = mod.ref
 
diff --git a/src/core/type.jl b/src/core/type.jl
@@ -2,7 +2,6 @@ export LLVMType, issized, context, show
 
 # subtypes are expected to have a 'ref::API.LLVMTypeRef' field
 abstract type LLVMType end
-reftype(::Type{T}) where {T<:LLVMType} = API.LLVMTypeRef
 
 Base.unsafe_convert(::Type{API.LLVMTypeRef}, typ::LLVMType) = typ.ref
 
@@ -44,7 +43,7 @@ Base.isempty(@nospecialize(T::LLVMType)) = false
 export width
 
 @checked struct IntegerType <: LLVMType
-    ref::reftype(LLVMType)
+    ref::API.LLVMTypeRef
 end
 identify(::Type{LLVMType}, ::Val{API.LLVMIntegerTypeKind}) = IntegerType
 
@@ -81,7 +80,7 @@ for T in [:Half, :Float, :Double]
     enumkind = Symbol(:LLVM, T, :TypeKind)
     @eval begin
         @checked struct $api_typename <: FloatingPointType
-            ref::reftype(FloatingPointType)
+            ref::API.LLVMTypeRef
         end
         identify(::Type{LLVMType}, ::Val{API.$enumkind}) = $api_typename
 
@@ -97,7 +96,7 @@ end
 export isvararg, return_type, parameters
 
 @checked struct FunctionType <: LLVMType
-    ref::reftype(LLVMType)
+    ref::API.LLVMTypeRef
 end
 identify(::Type{LLVMType}, ::Val{API.LLVMFunctionTypeKind}) = FunctionType
 
@@ -136,7 +135,7 @@ Base.eltype(typ::SequentialType) = LLVMType(API.LLVMGetElementType(typ))
 
 
 @checked struct PointerType <: SequentialType
-    ref::reftype(SequentialType)
+    ref::API.LLVMTypeRef
 end
 identify(::Type{LLVMType}, ::Val{API.LLVMPointerTypeKind}) = PointerType
 
@@ -149,7 +148,7 @@ addrspace(ptrtyp::PointerType) =
 
 
 @checked struct ArrayType <: SequentialType
-    ref::reftype(SequentialType)
+    ref::API.LLVMTypeRef
 end
 identify(::Type{LLVMType}, ::Val{API.LLVMArrayTypeKind}) = ArrayType
 
@@ -163,7 +162,7 @@ Base.isempty(@nospecialize(T::ArrayType)) = length(T) == 0 || isempty(eltype(T))
 
 
 @checked struct VectorType <: SequentialType
-    ref::reftype(SequentialType)
+    ref::API.LLVMTypeRef
 end
 identify(::Type{LLVMType}, ::Val{API.LLVMVectorTypeKind}) = VectorType
 
@@ -179,7 +178,7 @@ Base.size(vectyp::VectorType) = API.LLVMGetVectorSize(vectyp)
 export name, ispacked, isopaque, elements!
 
 @checked struct StructType <: SequentialType
-    ref::reftype(SequentialType)
+    ref::API.LLVMTypeRef
 end
 identify(::Type{LLVMType}, ::Val{API.LLVMStructTypeKind}) = StructType
 
@@ -243,7 +242,7 @@ end
 ## other
 
 @checked struct VoidType <: LLVMType
-    ref::reftype(LLVMType)
+    ref::API.LLVMTypeRef
 end
 identify(::Type{LLVMType}, ::Val{API.LLVMVoidTypeKind}) = VoidType
 
@@ -252,7 +251,7 @@ VoidType(ctx::Context) =
     VoidType(API.LLVMVoidTypeInContext(ctx))
 
 @checked struct LabelType <: LLVMType
-    ref::reftype(LLVMType)
+    ref::API.LLVMTypeRef
 end
 identify(::Type{LLVMType}, ::Val{API.LLVMLabelTypeKind}) = LabelType
 
@@ -261,15 +260,15 @@ LabelType(ctx::Context) =
     LabelType(API.LLVMLabelTypeInContext(ctx))
 
 @checked struct MetadataType <: LLVMType
-    ref::reftype(LLVMType)
+    ref::API.LLVMTypeRef
 end
 identify(::Type{LLVMType}, ::Val{API.LLVMMetadataTypeKind}) = MetadataType
 
 MetadataType(ctx::Context) =
     MetadataType(API.LLVMMetadataTypeInContext(ctx))
 
 @checked struct TokenType <: LLVMType
-    ref::reftype(LLVMType)
+    ref::API.LLVMTypeRef
 end
 identify(::Type{LLVMType}, ::Val{API.LLVMTokenTypeKind}) = TokenType
 
diff --git a/src/core/value.jl b/src/core/value.jl
@@ -5,7 +5,6 @@ export Value
 
 # subtypes are expected to have a 'ref::API.LLVMValueRef' field
 abstract type Value end
-reftype(::Type{T}) where {T<:Value} = API.LLVMValueRef
 
 Base.unsafe_convert(::Type{API.LLVMValueRef}, val::Value) = val.ref
 
@@ -72,7 +71,6 @@ export Use, user, value
 @checked struct Use
     ref::API.LLVMUseRef
 end
-reftype(::Type{Use}) = API.LLVMUseRef
 
 Base.unsafe_convert(::Type{API.LLVMUseRef}, use::Use) = use.ref
 
diff --git a/src/core/value/constant.jl b/src/core/value/constant.jl
@@ -8,7 +8,7 @@ isnull(val::Value) = convert(Core.Bool, API.LLVMIsNull(val))
 
 
 @checked struct UndefValue <: User
-    ref::reftype(User)
+    ref::API.LLVMValueRef
 end
 identify(::Type{Value}, ::Val{API.LLVMUndefValueValueKind}) = UndefValue
 
@@ -25,7 +25,7 @@ abstract type Instruction <: User end
 
 
 @checked struct PointerNull <: Constant
-    ref::reftype(User)
+    ref::API.LLVMValueRef
 end
 identify(::Type{Value}, ::Val{API.LLVMConstantPointerNullValueKind}) = PointerNull
 
@@ -37,7 +37,7 @@ PointerNull(typ::PointerType) = PointerNull(API.LLVMConstPointerNull(typ))
 export ConstantInt, ConstantFP
 
 @checked struct ConstantInt <: Constant
-    ref::reftype(Constant)
+    ref::API.LLVMValueRef
 end
 identify(::Type{Value}, ::Val{API.LLVMConstantIntValueKind}) = ConstantInt
 
@@ -75,7 +75,7 @@ Base.convert(::Type{T}, val::ConstantInt) where {T<:Signed} =
 
 
 @checked struct ConstantFP <: Constant
-    ref::reftype(Constant)
+    ref::API.LLVMValueRef
 end
 identify(::Type{Value}, ::Val{API.LLVMConstantFPValueKind}) = ConstantFP
 
@@ -91,7 +91,7 @@ Base.convert(::Type{Float64}, val::ConstantFP) =
 export ConstantAggregateZero
 
 @checked struct ConstantAggregateZero <: Constant
-    ref::reftype(Constant)
+    ref::API.LLVMValueRef
 end
 identify(::Type{Value}, ::Val{API.LLVMConstantAggregateZeroValueKind}) = ConstantAggregateZero
 
@@ -104,29 +104,29 @@ identify(::Type{Value}, ::Val{API.LLVMConstantAggregateZeroValueKind}) = Constan
 export ConstantExpr, ConstantAggregate, ConstantArray, ConstantStruct, ConstantVector, InlineAsm
 
 @checked struct ConstantExpr <: Constant
-    ref::reftype(Constant)
+    ref::API.LLVMValueRef
 end
 identify(::Type{Value}, ::Val{API.LLVMConstantExprValueKind}) = ConstantExpr
 
 abstract type ConstantAggregate <: Constant end
 
 @checked struct ConstantArray <: ConstantAggregate
-    ref::reftype(Constant)
+    ref::API.LLVMValueRef
 end
 identify(::Type{Value}, ::Val{API.LLVMConstantArrayValueKind}) = ConstantArray
 
 @checked struct ConstantStruct <: ConstantAggregate
-    ref::reftype(Constant)
+    ref::API.LLVMValueRef
 end
 identify(::Type{Value}, ::Val{API.LLVMConstantStructValueKind}) = ConstantStruct
 
 @checked struct ConstantVector <: ConstantAggregate
-    ref::reftype(Constant)
+    ref::API.LLVMValueRef
 end
 identify(::Type{Value}, ::Val{API.LLVMConstantVectorValueKind}) = ConstantVector
 
 @checked struct InlineAsm <: Constant
-    ref::reftype(Constant)
+    ref::API.LLVMValueRef
 end
 identify(::Type{Value}, ::Val{API.LLVMInlineAsmValueKind}) = InlineAsm
 
@@ -204,7 +204,7 @@ export GlobalVariable, unsafe_delete!,
        isextinit, extinit!
 
 @checked struct GlobalVariable <: GlobalObject
-    ref::reftype(GlobalObject)
+    ref::API.LLVMValueRef
 end
 identify(::Type{Value}, ::Val{API.LLVMGlobalVariableValueKind}) = GlobalVariable
 
diff --git a/src/datalayout.jl b/src/datalayout.jl
@@ -7,7 +7,6 @@ export DataLayout, dispose,
        element_at, offsetof
 
 # forward definition of DataLayout in src/module.jl
-reftype(::Type{DataLayout}) = API.LLVMTargetDataRef
 
 Base.unsafe_convert(::Type{API.LLVMTargetDataRef}, dl::DataLayout) = dl.ref
 
diff --git a/src/execution.jl b/src/execution.jl
@@ -9,7 +9,6 @@ export GenericValue, dispose,
 @checked struct GenericValue
     ref::API.LLVMGenericValueRef
 end
-reftype(::Type{GenericValue}) = API.LLVMGenericValueRef
 
 Base.unsafe_convert(::Type{API.LLVMGenericValueRef}, val::GenericValue) = val.ref
 
@@ -57,7 +56,6 @@ export ExecutionEngine, Interpreter, JIT,
 @checked struct ExecutionEngine
     ref::API.LLVMExecutionEngineRef
 end
-reftype(::Type{ExecutionEngine}) = API.LLVMExecutionEngineRef
 
 Base.unsafe_convert(::Type{API.LLVMExecutionEngineRef}, engine::ExecutionEngine) = engine.ref
 
diff --git a/src/irbuilder.jl b/src/irbuilder.jl
@@ -8,7 +8,6 @@ export Builder,
 @checked struct Builder
     ref::API.LLVMBuilderRef
 end
-reftype(::Type{Builder}) = API.LLVMBuilderRef
 
 Base.unsafe_convert(::Type{API.LLVMBuilderRef}, builder::Builder) = builder.ref
 
diff --git a/src/moduleprovider.jl b/src/moduleprovider.jl
@@ -6,7 +6,6 @@ export ModuleProvider, dispose
 @checked struct ModuleProvider
     ref::API.LLVMModuleProviderRef
 end
-reftype(::Type{ModuleProvider}) = API.LLVMModuleProviderRef
 
 Base.unsafe_convert(::Type{API.LLVMModuleProviderRef}, mp::ModuleProvider) = mp.ref
 
diff --git a/src/pass.jl b/src/pass.jl
diff --git a/src/passmanager.jl b/src/passmanager.jl
diff --git a/src/passregistry.jl b/src/passregistry.jl
diff --git a/src/target.jl b/src/target.jl
diff --git a/src/targetmachine.jl b/src/targetmachine.jl
diff --git a/src/transform.jl b/src/transform.jl
diff --git a/src/util.jl b/src/util.jl
