Merge pull request #520 from JuliaLLVM/tb/rm_retestitems

maleadt · web-flow · commit f38eead8891c · 2025-06-25T11:05:20.000+02:00
Get rid of ReTestItems.jl.
diff --git a/examples/generated.jl b/examples/generated.jl
@@ -17,15 +17,22 @@ end
         T_ptr = LLVM.PointerType(eltyp)
 
         # create a function
-        paramtyps = [T_int, T_int]
+        paramtyps = if VERSION >= v"1.12-"
+            [T_ptr, T_int]
+        else
+            [T_int, T_int]
+        end
         llvmf, _ = create_function(eltyp, paramtyps)
 
         # generate IR
         @dispose builder=IRBuilder() begin
             entry = BasicBlock(llvmf, "entry")
             position!(builder, entry)
 
-            ptr = inttoptr!(builder, parameters(llvmf)[1], T_ptr)
+            ptr = parameters(llvmf)[1]
+            if value_type(ptr) isa LLVM.IntegerType
+                ptr = inttoptr!(builder, ptr, T_ptr)
+            end
 
             ptr = gep!(builder, eltyp, ptr, [parameters(llvmf)[2]])
             val = load!(builder, eltyp, ptr)
diff --git a/src/buffer.jl b/src/buffer.jl
@@ -59,7 +59,7 @@ function MemoryBufferFile(path::String)
         throw(LLVMException(error))
     end
 
-    MemoryBuffer(out_ref[])
+    mark_alloc(MemoryBuffer(out_ref[]))
 end
 
 function MemoryBufferFile(f::Core.Function, args...; kwargs...)
diff --git a/src/core/module.jl b/src/core/module.jl
@@ -243,7 +243,7 @@ end
 Convert the given module to a memory buffer containing its bitcode.
 """
 Base.convert(::Type{MemoryBuffer}, mod::Module) =
-    MemoryBuffer(API.LLVMWriteBitcodeToMemoryBuffer(mod))
+    mark_alloc(MemoryBuffer(API.LLVMWriteBitcodeToMemoryBuffer(mod)))
 
 """
     convert(::Type{Vector}, mod::Module)
diff --git a/src/execution.jl b/src/execution.jl
@@ -72,7 +72,7 @@ Base.convert(::Type{T}, val::GenericValue) where {T<:Unsigned} =
 Create a generic value from a floating point number of the given type.
 """
 GenericValue(typ::FloatingPointType, N::AbstractFloat) =
-    GenericValue(API.LLVMCreateGenericValueOfFloat(typ, convert(Cdouble, N)))
+    mark_alloc(GenericValue(API.LLVMCreateGenericValueOfFloat(typ, convert(Cdouble, N))))
 
 # NOTE: this ugly three-arg convert is needed to match the C API,
 #       which uses the type to call the correct C++ function.
@@ -93,7 +93,7 @@ Base.convert(::Type{T}, val::GenericValue, typ::LLVMType) where {T<:AbstractFloa
 Create a generic value from a pointer.
 """
 GenericValue(ptr::Ptr) =
-    GenericValue(API.LLVMCreateGenericValueOfPointer(convert(Ptr{Cvoid}, ptr)))
+    mark_alloc(GenericValue(API.LLVMCreateGenericValueOfPointer(convert(Ptr{Cvoid}, ptr))))
 
 """
     convert(::Type{Ptr{T}}, val::GenericValue)
@@ -234,8 +234,8 @@ end
 Run the given function with the given arguments in the execution engine.
 """
 Base.run(engine::ExecutionEngine, f::Function, args::Vector{GenericValue}=GenericValue[]) =
-    GenericValue(API.LLVMRunFunction(engine, f,
-                                     length(args), args))
+    mark_alloc(GenericValue(API.LLVMRunFunction(engine, f,
+                                                length(args), args)))
 
 """
     lookup(engine::ExecutionEngine, fn::String)
diff --git a/src/executionengine/lljit.jl b/src/executionengine/lljit.jl
@@ -1,20 +1,20 @@
 @checked struct LLJITBuilder
     ref::API.LLVMOrcLLJITBuilderRef
 end
-Base.unsafe_convert(::Type{API.LLVMOrcLLJITBuilderRef}, builder::LLJITBuilder) = builder.ref
+Base.unsafe_convert(::Type{API.LLVMOrcLLJITBuilderRef}, builder::LLJITBuilder) = mark_use(builder).ref
 
 @checked mutable struct LLJIT
     ref::API.LLVMOrcLLJITRef
 end
-Base.unsafe_convert(::Type{API.LLVMOrcLLJITRef}, lljit::LLJIT) = lljit.ref
+Base.unsafe_convert(::Type{API.LLVMOrcLLJITRef}, lljit::LLJIT) = mark_use(lljit).ref
 
 function LLJITBuilder()
     ref = API.LLVMOrcCreateLLJITBuilder()
-    LLJITBuilder(ref)
+    mark_alloc(LLJITBuilder(ref))
 end
 
 function dispose(builder::LLJITBuilder)
-    API.LLVMOrcDisposeLLJITBuilder(builder)
+    mark_dispose(API.LLVMOrcDisposeLLJITBuilder, builder)
 end
 
 function targetmachinebuilder!(builder::LLJITBuilder, tmb::TargetMachineBuilder)
@@ -36,11 +36,12 @@ Creates a LLJIT stack based on the provided builder.
 function LLJIT(builder::LLJITBuilder)
     ref = Ref{API.LLVMOrcLLJITRef}()
     @check API.LLVMOrcCreateLLJIT(ref, builder)
-    LLJIT(ref[])
+    mark_dispose(builder)
+    mark_alloc(LLJIT(ref[]))
 end
 
 function dispose(lljit::LLJIT)
-    API.LLVMOrcDisposeLLJIT(lljit)
+    mark_dispose(API.LLVMOrcDisposeLLJIT, lljit)
 end
 
 """
diff --git a/src/executionengine/ts_module.jl b/src/executionengine/ts_module.jl
@@ -8,7 +8,7 @@ A thread-safe version of [`Context`](@ref).
 @checked struct ThreadSafeContext
     ref::API.LLVMOrcThreadSafeContextRef
 end
-Base.unsafe_convert(::Type{API.LLVMOrcThreadSafeContextRef}, ctx::ThreadSafeContext) = ctx.ref
+Base.unsafe_convert(::Type{API.LLVMOrcThreadSafeContextRef}, ctx::ThreadSafeContext) = mark_use(ctx).ref
 
 """
     ThreadSafeContext(; opaque_pointers=nothing)
@@ -19,7 +19,7 @@ Create a new thread-safe context. The behavior of `opaque_pointers` is the same
 This object needs to be disposed of using [`dispose(::ThreadSafeContext)`](@ref).
 """
 function ThreadSafeContext(; opaque_pointers=nothing)
-    ts_ctx = ThreadSafeContext(API.LLVMOrcCreateNewThreadSafeContext())
+    ts_ctx = mark_alloc(ThreadSafeContext(API.LLVMOrcCreateNewThreadSafeContext()))
     if opaque_pointers !== nothing
         opaque_pointers!(context(ts_ctx), opaque_pointers)
     end
@@ -58,7 +58,7 @@ Dispose of the thread-safe context, releasing all resources associated with it.
 """
 function dispose(ctx::ThreadSafeContext)
     deactivate(ctx)
-    API.LLVMOrcDisposeThreadSafeContext(ctx)
+    mark_dispose(API.LLVMOrcDisposeThreadSafeContext, ctx)
 end
 
 """
@@ -95,11 +95,12 @@ function ThreadSafeModule(mod::Module)
         mod = context!(context(ts_context())) do
             parse(Module, bitcode)
         end
+        dispose(bitcode)
     end
     @assert context(mod) == context(ts_context())
 
     ref = API.LLVMOrcCreateNewThreadSafeModule(mod, ts_context())
-    tsm = ThreadSafeModule(ref)
+    tsm = mark_alloc(ThreadSafeModule(ref))
     mark_dispose(mod)
     return tsm
 end
@@ -127,7 +128,7 @@ end
 Dispose of the thread-safe module, releasing all resources associated with it.
 """
 function dispose(mod::ThreadSafeModule)
-    API.LLVMOrcDisposeThreadSafeModule(mod)
+    mark_dispose(API.LLVMOrcDisposeThreadSafeModule, mod)
 end
 
 mutable struct ThreadSafeModuleCallback
diff --git a/src/orc.jl b/src/orc.jl
@@ -252,6 +252,7 @@ end
 Base.unsafe_convert(::Type{API.LLVMOrcMaterializationResponsibilityRef}, mr::MaterializationResponsibility) = mr.ref
 
 function emit(il::IRTransformLayer, mr::MaterializationResponsibility, tsm::ThreadSafeModule)
+    mark_dispose(tsm)
     API.LLVMOrcIRTransformLayerEmit(il, mr, tsm)
 end
 
@@ -455,6 +456,7 @@ function emit(il::IRCompileLayer, mr::MaterializationResponsibility, tsm::Thread
             decorate_module(mod)
         end
     end
+    mark_dispose(tsm)
     API.LLVMOrcIRCompileLayerEmit(il, mr, tsm)
 end
 
diff --git a/src/transform.jl b/src/transform.jl
@@ -9,11 +9,11 @@ export PassManagerBuilder, dispose,
     ref::API.LLVMPassManagerBuilderRef
 end
 
-Base.unsafe_convert(::Type{API.LLVMPassManagerBuilderRef}, pmb::PassManagerBuilder) = pmb.ref
+Base.unsafe_convert(::Type{API.LLVMPassManagerBuilderRef}, pmb::PassManagerBuilder) = mark_use(pmb).ref
 
-PassManagerBuilder() = PassManagerBuilder(API.LLVMPassManagerBuilderCreate())
+PassManagerBuilder() = mark_alloc(PassManagerBuilder(API.LLVMPassManagerBuilderCreate()))
 
-dispose(pmb::PassManagerBuilder) = API.LLVMPassManagerBuilderDispose(pmb)
+dispose(pmb::PassManagerBuilder) = mark_dispose(API.LLVMPassManagerBuilderDispose, pmb)
 
 function PassManagerBuilder(f::Core.Function)
     pmb = PassManagerBuilder()
diff --git a/test/Kaleidoscope.jl b/test/Kaleidoscope.jl
@@ -1,4 +1,4 @@
-@testitem "Kaleidoscope" begin
+@testset "Kaleidoscope" begin
 
 include(joinpath(@__DIR__, "..", "examples", "Kaleidoscope", "Kaleidoscope.jl"))
 
diff --git a/test/Project.toml b/test/Project.toml
@@ -3,7 +3,6 @@ Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
 BFloat16s = "ab4f0b2a-ad5b-11e8-123f-65d77653426b"
 IOCapture = "b5f81e59-6552-4d32-b1f0-c071b021bf89"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
-ReTestItems = "817f1d60-ba6b-4fd5-9520-3cf149f6a823"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 
diff --git a/test/analysis.jl b/test/analysis.jl
@@ -1,4 +1,4 @@
-@testitem "analysis" begin
+@testset "analysis" begin
 
 @dispose ctx=Context() builder=IRBuilder() mod=LLVM.Module("SomeModule") begin
     ft = LLVM.FunctionType(LLVM.Int32Type())
diff --git a/test/aqua.jl b/test/aqua.jl
@@ -1,4 +1,4 @@
-@testitem "Aqua" begin
+@testset "Aqua" begin
 
 using Aqua
 
diff --git a/test/buffer.jl b/test/buffer.jl
@@ -1,4 +1,4 @@
-@testitem "buffer" begin
+@testset "buffer" begin
 
 data = rand(UInt8, 8)
 
diff --git a/test/core.jl b/test/core.jl
@@ -1,4 +1,4 @@
-@testitem "core" setup=[TestHelpers] begin
+@testset "core" begin
 
 using BFloat16s
 
diff --git a/test/datalayout.jl b/test/datalayout.jl
@@ -1,4 +1,4 @@
-@testitem "datalayout" begin
+@testset "datalayout" begin
 
 dlstr = "E-p:32:32-f128:128:128"
 
diff --git a/test/debuginfo.jl b/test/debuginfo.jl
@@ -1,4 +1,4 @@
-@testitem "debuginfo" begin
+@testset "debuginfo" begin
 
 DEBUG_METADATA_VERSION()
 
diff --git a/test/essential.jl b/test/essential.jl
@@ -1,4 +1,4 @@
-@testitem "essentials" begin
+@testset "essentials" begin
 
 @test InitializeNativeTarget() === nothing
 @test InitializeAllTargetInfos() === nothing
diff --git a/test/examples.jl b/test/examples.jl
@@ -1,4 +1,4 @@
-@testitem "examples" begin
+@testset "examples" begin
 
 function find_sources(path::String, sources=String[])
     if isdir(path)
diff --git a/test/execution.jl b/test/execution.jl
@@ -1,4 +1,4 @@
-@testitem "execution" begin
+@testset "execution" begin
 
 @testset "generic values" begin
 
diff --git a/test/helpers_testsetup.jl b/test/helpers_testsetup.jl
diff --git a/test/instructions.jl b/test/instructions.jl
@@ -1,4 +1,4 @@
-@testitem "instructions" setup=[TestHelpers] begin
+@testset "instructions" begin
 
 @testset "irbuilder" begin
 
diff --git a/test/interop.jl b/test/interop.jl
@@ -1,4 +1,4 @@
-@testitem "interop" begin
+@testset "interop" begin
 
 using LLVM.Interop
 using InteractiveUtils
diff --git a/test/jljit.jl b/test/jljit.jl
@@ -1,4 +1,4 @@
-@testitem "jljit" begin
+@testset "jljit" begin
 
 let jljit=JuliaOJIT()
     dispose(jljit)
@@ -15,8 +15,7 @@ ThreadSafeContext() do ctx
 end
 
 @testset "ThreadSafeModule" begin
-    @dispose ts_ctx=ThreadSafeContext() begin
-        ts_mod = ThreadSafeModule("jit")
+    @dispose ts_ctx=ThreadSafeContext() ts_mod=ThreadSafeModule("jit") begin
         @test_throws LLVMException ts_mod() do mod
             error("Error")
         end
diff --git a/test/linker.jl b/test/linker.jl
@@ -1,4 +1,4 @@
-@testitem "linker" begin
+@testset "linker" begin
 
 @dispose ctx=Context() builder=IRBuilder() begin
     mod1 = let
diff --git a/test/newpm.jl b/test/newpm.jl
@@ -1,5 +1,5 @@
 
-@testitem "newpm" begin
+@testset "newpm" begin
 
 using LLVM.Interop
 using IOCapture
diff --git a/test/orc.jl b/test/orc.jl
@@ -1,4 +1,4 @@
-@testitem "orc" begin
+@testset "orc" begin
 
 let lljit=LLJIT()
     dispose(lljit)
@@ -15,8 +15,7 @@ ThreadSafeContext() do ctx
 end
 
 @testset "ThreadSafeModule" begin
-    @dispose ts_ctx=ThreadSafeContext() begin
-        ts_mod = ThreadSafeModule("jit")
+    @dispose ts_ctx=ThreadSafeContext() ts_mod=ThreadSafeModule("jit") begin
         @test_throws LLVMException ts_mod() do mod
             error("Error")
         end
diff --git a/test/pass.jl b/test/pass.jl
@@ -1,4 +1,4 @@
-@testitem "pass" begin
+@testset "pass" begin
 
 @dispose ctx=Context() builder=IRBuilder() mod=LLVM.Module("SomeModule") begin
     ft = LLVM.FunctionType(LLVM.VoidType())
diff --git a/test/passmanager.jl b/test/passmanager.jl
@@ -1,4 +1,4 @@
-@testitem "passmanager" begin
+@testset "passmanager" begin
 
 let
     mpm = ModulePassManager()
diff --git a/test/runtests.jl b/test/runtests.jl
diff --git a/test/setup.jl b/test/setup.jl
diff --git a/test/support.jl b/test/support.jl
diff --git a/test/target.jl b/test/target.jl
diff --git a/test/targetmachine.jl b/test/targetmachine.jl
diff --git a/test/transform.jl b/test/transform.jl
diff --git a/test/util.jl b/test/util.jl

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@testitem "Kaleidoscope" begin`
	`1`	`+@testset "Kaleidoscope" begin`
`2`	`2`
`3`	`3`	`include(joinpath(@__DIR__, "..", "examples", "Kaleidoscope", "Kaleidoscope.jl"))`
`4`	`4`