Skip to content

Commit a7fa1e7

Browse files
authored
#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.
2 parents 36a0da0 + b260cab commit a7fa1e7

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
@@ -1935,9 +1935,10 @@ end
19351935
dep = staledeps[i]
19361936
dep isa Module && continue
19371937
modpath, modkey, modbuild_id, modcachepath, modstaledeps, modocachepath = dep::Tuple{String, PkgId, UInt128, String, Vector{Any}, Union{Nothing, String}}
1938-
dep = get(loaded_precompiles, modkey => modbuild_id, nothing)
1939-
if dep === nothing
1938+
if stalecheck
19401939
dep = maybe_root_module(modkey)
1940+
else
1941+
dep = get(loaded_precompiles, modkey => modbuild_id, nothing)
19411942
end
19421943
while true
19431944
if dep isa Module
@@ -1978,7 +1979,7 @@ end
19781979
finally
19791980
for modkey in newdeps
19801981
insert_extension_triggers(modkey)
1981-
run_package_callbacks(modkey)
1982+
stalecheck && run_package_callbacks(modkey)
19821983
end
19831984
empty!(newdeps)
19841985
end

0 commit comments

Comments
 (0)