Adapt to binding world-age changes (JuliaLang/julia#57102)

topolarity · Feb 10, 2025 · e33d4d0 · e33d4d0
1 parent b60bb2b
commit e33d4d0
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 14 deletions.
diff --git a/src/Tracy.jl b/src/Tracy.jl
@@ -52,20 +52,38 @@ const ID = gensym(:id)
 const META = gensym(:meta)
 const METAType = Vector{TracySrcLoc}
 
-function meta(m::Module; autoinit::Bool=true)
-    if !isdefined(m, META) || getfield(m, META) === nothing
-        autoinit ? initmeta(m) : return nothing
+@static if VERSION >= v"1.12-DEV"
+    function meta(m::Module; autoinit::Bool=true)
+        if !isdefinedglobal(m, META)
+            autoinit ? invokelatest(initmeta, m) : return nothing
+        end
+        return invokelatest(getfield, m, META)::METAType
+    end
+
+    function initmeta(m::Module)
+        if !isdefinedglobal(m, META)
+            Core.eval(m, :($META = $(METAType())))
+            Core.eval(m, :($ID() = nothing))
+            Core.eval(m, :($Tracy.tracepoint_enabled(::Val{$ID}, ::Val) = true))
+        end
+        nothing
+    end
+else
+    function meta(m::Module; autoinit::Bool=true)
+        if !isdefined(m, META) || getfield(m, META) === nothing
+            autoinit ? initmeta(m) : return nothing
+        end
+        return getfield(m, META)::METAType
     end
-    return getfield(m, META)::METAType
-end
 
-function initmeta(m::Module)
-    if !isdefined(m, META) || getfield(m, META) === nothing
-        Core.eval(m, :($META = $(METAType())))
-        Core.eval(m, :($ID() = nothing))
-        Core.eval(m, :($Tracy.tracepoint_enabled(::Val{$ID}, ::Val) = true))
+    function initmeta(m::Module)
+        if !isdefined(m, META) || getfield(m, META) === nothing
+            Core.eval(m, :($META = $(METAType())))
+            Core.eval(m, :($ID() = nothing))
+            Core.eval(m, :($Tracy.tracepoint_enabled(::Val{$ID}, ::Val) = true))
+        end
+        nothing
     end
-    nothing
 end
 
 const modules = Set{Module}()
@@ -112,7 +130,7 @@ function __init__()
         for m in modules
             for (i, srcloc) in enumerate(meta(m))
                 if pointer_from_objref(srcloc) == tracy_srcloc_ptr
-                    m_id = getfield(m, ID)
+                    m_id = invokelatest(getfield, m, ID)
                     old_enable = srcloc.enabled
                     if enable != old_enable
                         if old_enable == 0xFF

diff --git a/src/tracepoint.jl b/src/tracepoint.jl
@@ -141,7 +141,7 @@ function _tracepoint(name::Union{String, Nothing}, func::Union{String, Nothing},
     push!(meta(mod), srcloc)
 
     N = length(meta(mod))
-    m_id = getfield(mod, ID)
+    m_id = invokelatest(getfield, mod, ID)
 
     return quote
         if tracepoint_enabled(Val($m_id), Val($N))
@@ -211,7 +211,7 @@ existing code containing the tracepoint(s).
     It is strongly recommended to use `enable_tracepoint` instead.
 """
 function configure_tracepoint(m::Module, enable::Bool; name="", func="", file="")
-    m_id = getfield(m, ID)
+    m_id = invokelatest(getfield, m, ID)
     for (i, srcloc) in enumerate(meta(m))
         contains(srcloc.name, name) || continue
         contains(srcloc.func, func) || continue