prevent package_callbacks to run multiple time for a single package (…

…JuliaLang#54243) Introduced in JuliaLang#52841.
lazarusA · Jul 12, 2024 · 891dc8d · 891dc8d
1 parent fac7080
commit 891dc8d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/base/loading.jl b/base/loading.jl
@@ -2273,7 +2273,7 @@ function __require_prelocked(uuidkey::PkgId, env=nothing)
         run_package_callbacks(uuidkey)
     else
         m = get(loaded_modules, uuidkey, nothing)
-        if m !== nothing
+        if m !== nothing && !haskey(explicit_loaded_modules, uuidkey)
             explicit_loaded_modules[uuidkey] = m
             run_package_callbacks(uuidkey)
         end

diff --git a/test/precompile.jl b/test/precompile.jl
@@ -1331,6 +1331,25 @@ precompile_test_harness("package_callbacks") do dir
     finally
         pop!(Base.package_callbacks)
     end
+    Test5_module = :Teste4095a85
+    write(joinpath(dir, "$(Test5_module).jl"),
+    """
+    module $(Test5_module)
+    end
+    """)
+    Base.compilecache(Base.PkgId("$(Test5_module)"))
+    cnt = 0
+    push!(Base.package_callbacks, _->(cnt += 1))
+    try
+        @eval using $(Symbol(Test5_module))
+        @eval using $(Symbol(Test5_module))
+        @eval using $(Symbol(Test5_module))
+        @eval using $(Symbol(Test5_module))
+        @eval using $(Symbol(Test5_module))
+        @test cnt == 1
+    finally
+        pop!(Base.package_callbacks)
+    end
 end
 
 # Issue #19960