Skip to content

Commit bddb4ed

Browse files
vtjnashKristofferC
authored andcommitted
#54739-related fixes for loading stdlibs (#54891)
This fixes a couple unconventional issues people encountered and were able to report as bugs against #54739 Note that due to several bugs in REPLExt itself (#54889, #54888), loading the extension may still crash julia in some circumstances, but that is now a Pkg bug, and no longer the fault of the loading code. (cherry picked from commit a7fa1e7)
1 parent 19f838f commit bddb4ed

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

base/loading.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1886,9 +1886,10 @@ end
18861886
dep = staledeps[i]
18871887
dep isa Module && continue
18881888
modpath, modkey, modbuild_id, modcachepath, modstaledeps, modocachepath = dep::Tuple{String, PkgId, UInt128, String, Vector{Any}, Union{Nothing, String}}
1889-
dep = get(loaded_precompiles, modkey => modbuild_id, nothing)
1890-
if dep === nothing
1889+
if stalecheck
18911890
dep = maybe_root_module(modkey)
1891+
else
1892+
dep = get(loaded_precompiles, modkey => modbuild_id, nothing)
18921893
end
18931894
while true
18941895
if dep isa Module
@@ -1929,7 +1930,7 @@ end
19291930
finally
19301931
for modkey in newdeps
19311932
insert_extension_triggers(modkey)
1932-
run_package_callbacks(modkey)
1933+
stalecheck && run_package_callbacks(modkey)
19331934
end
19341935
empty!(newdeps)
19351936
end

0 commit comments

Comments
 (0)