fix some more places

Author: vchuravy

src/compiler.jl

@@ -3704,7 +3704,7 @@ function lower_convention(
                     metadata(sretPtr)["enzyme_inactive"] = MDNode(LLVM.Metadata[])
                 end
 
-                typeTree = copy(typetree(job, actualRetType, ctx, dl, seen))
+                typeTree = copy(typetree_total(job, actualRetType, ctx, dl, seen))
                 merge!(typeTree, TypeTree(API.DT_Pointer, ctx))
                 only!(typeTree, -1)
                 metadata(sretPtr)["enzyme_type"] = to_md(typeTree, ctx)
@@ -3900,7 +3900,7 @@ function lower_convention(
                     return_attributes(wrapper_f),
                     StringAttribute(
                         "enzyme_type",
-                        string(typetree(actualRetType, ctx, dl, seen)),
+                        string(typetree_total(job, actualRetType, ctx, dl, seen)),
                     ),
                 )
                 push!(
@@ -3926,7 +3926,7 @@ function lower_convention(
                     return_attributes(wrapper_f),
                     StringAttribute(
                         "enzyme_type",
-                        string(typetree(actualRetType, ctx, dl, seen)),
+                        string(typetree_total(job, actualRetType, ctx, dl, seen)),
                     ),
                 )
                 push!(
@@ -3955,7 +3955,7 @@ function lower_convention(
                     return_attributes(wrapper_f),
                     StringAttribute(
                         "enzyme_type",
-                        string(typetree(eltype(RetActivity), ctx, dl, seen)),
+                        string(typetree_total(job, eltype(RetActivity), ctx, dl, seen)),
                     ),
                 )
                 push!(
@@ -3993,7 +3993,7 @@ function lower_convention(
                     return_attributes(wrapper_f),
                     StringAttribute(
                         "enzyme_type",
-                        string(typetree(actualRetType, ctx, dl, seen)),
+                        string(typetree_total(job, actualRetType, ctx, dl, seen)),
                     ),
                 )
                 push!(
@@ -4641,7 +4641,7 @@ function GPUCompiler.compile_unhooked(output::Symbol, job::CompilerJob{<:EnzymeT
                     source_typ
                 end
 
-                ec = typetree(source_typ, ctx, dl, seen)
+                ec = typetree_total(job, source_typ, ctx, dl, seen)
                 if byref == GPUCompiler.MUT_REF || byref == GPUCompiler.BITS_REF
                     ec = copy(ec)
                     merge!(ec, TypeTree(API.DT_Pointer, ctx))
@@ -4680,7 +4680,7 @@ end
                     )
                 else
                     metadata(inst)["enzyme_type"] =
-                        to_md(typetree(Ptr{Cvoid}, ctx, dl, seen), ctx)
+                        to_md(typetree_total(job, Ptr{Cvoid}, ctx, dl, seen), ctx)
                 end
             end
         end