Refactor to simplify

Author: mhauru

src/copyable_task.jl

@@ -443,12 +443,10 @@ get_value(x) = x
 expression, otherwise `false`.
 """
 function is_produce_stmt(x)::Bool
-    if Meta.isexpr(x, :invoke) && length(x.args) == 3 && x.args[1] isa Core.MethodInstance
-        # This branch is hit on Julia 1.11 and earlier.
-        return x.args[1].specTypes <: Tuple{typeof(produce),Any}
-    elseif Meta.isexpr(x, :invoke) && length(x.args) == 3 && x.args[1] isa Core.CodeInstance
-        # This branch is hit on Julia 1.12.
-        return x.args[1].def.specTypes <: Tuple{typeof(produce),Any}
+    if Meta.isexpr(x, :invoke) &&
+        length(x.args) == 3 &&
+        x.args[1] isa Union{Core.MethodInstance,Core.CodeInstance}
+        return get_mi(x.args[1]).specTypes <: Tuple{typeof(produce),Any}
     elseif Meta.isexpr(x, :call) && length(x.args) == 2
         return get_value(x.args[1]) === produce
     else
@@ -471,13 +469,7 @@ function stmt_might_produce(x, ret_type::Type)::Bool
 
     # Statement will terminate in the usual fashion, so _do_ bother recusing.
     is_produce_stmt(x) && return true
-    @static if VERSION >= v"1.12-"
-        # On Julia 1.12 x.args has CodeInstances rather than MethodInstances. We use .def
-        # to get the MethodInstances.
-        Meta.isexpr(x, :invoke) && return might_produce(x.args[1].def.specTypes)
-    else
-        Meta.isexpr(x, :invoke) && return might_produce(x.args[1].specTypes)
-    end
+    Meta.isexpr(x, :invoke) && return might_produce(get_mi(x.args[1]).specTypes)
     if Meta.isexpr(x, :call)
         # This is a hack -- it's perfectly possible for `DataType` calls to produce in general.
         f = get_function(x.args[1])

src/test_utils.jl

@@ -59,11 +59,7 @@ function (case::Testcase)()
             end
 
             for _ in iteration_results
-                # TODO(mhauru) We seem to be causing more allocations than expected on
-                # v1.12, needs investigating.
-                @static if VERSION < v"1.12-"
-                    @test count_allocs(consume, t) == 0
-                end
+                @test count_allocs(consume, t) == 0
             end
         end
     end