wip

Author: simeonschaub

src/legacy_loading.jl

@@ -156,7 +156,8 @@ function parse_pkg_files(id::PkgId)
     # To reduce compiler latency, use runtime dispatch for `queue_includes!`.
     # `queue_includes!` requires compilation of the whole parsing/expression-splitting infrastructure,
     # and it's better to wait to compile it until we actually need it.
-    invoke_revisefunc(worldage[], queue_includes!, pkgdata, id)
+    worldage[] = Base.get_world_counter()
+    invoke_revisefunc(queue_includes!, pkgdata, id)
     return pkgdata
 end
 

src/loading.jl

@@ -48,7 +48,8 @@ function parse_pkg_files(id::PkgId)
     # To reduce compiler latency, use runtime dispatch for `queue_includes!`.
     # `queue_includes!` requires compilation of the whole parsing/expression-splitting infrastructure,
     # and it's better to wait to compile it until we actually need it.
-    invoke_revisefunc(worldage[], queue_includes!, pkgdata, id)
+    worldage[] = Base.get_world_counter()
+    invoke_revisefunc(queue_includes!, pkgdata, id)
     return pkgdata
 end
 

src/packagedef.jl

@@ -273,7 +273,7 @@ function delete_missing!(exs_sigs_old::ExprsSigs, exs_sigs_new)
                             #try  # guard against serialization errors if the type isn't defined on the worker
                                 future = remotecall(Core.eval, p, Main, :(delete_method_by_sig($sig)))
                                 finalizer(future) do f
-                                    Base.invoke_revisefunc(worldage[], Distributed.finalize_ref, f)
+                                    invoke_revisefunc(Distributed.finalize_ref, f)
                                 end
                             #catch
                             #end
@@ -1204,7 +1204,7 @@ end
 # This uses invokelatest not for reasons of world age but to ensure that the call is made at runtime.
 # This allows `revise_first` to be compiled without compiling `revise` itself, and greatly
 # reduces the overhead of using Revise.
-revise_first(ex) = Expr(:toplevel, :(isempty($revision_queue) || Base.invoke_revisefunc($revise)), ex)
+revise_first(ex) = Expr(:toplevel, :(isempty($revision_queue) || (worldage[] = Base.get_world_counter(); invoke_revisefunc($revise))), ex)
 
 @noinline function run_backend(backend)
     while true
@@ -1355,8 +1355,8 @@ function __init__()
     id = PkgId(nothing, "@REPL")
     pkgdatas[id] = pkgdata = PkgData(id, nothing)
     # Set the lookup callbacks
-    CodeTracking.method_lookup_callback[] = get_def
-    CodeTracking.expressions_callback[] = get_expressions
+    CodeTracking.method_lookup_callback[] = x -> (worldage[] = Base.get_world_counter(); invoke_revisefunc(get_def, x))
+    CodeTracking.expressions_callback[] = x -> (worldage[] = Base.get_world_counter(); invoke_revisefunc(get_expressions, x))
 
     # Watch the manifest file for changes
     mfile = manifest_file()