Skip to content

Commit eb1036b

Browse files
fix require_stdlib fast path for loaded exts
1 parent 12c59bd commit eb1036b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

base/loading.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2503,6 +2503,9 @@ end
25032503
# load a serialized file directly from append_bundled_depot_path for uuidkey without stalechecks
25042504
function require_stdlib(uuidkey::PkgId, ext::Union{Nothing, String}=nothing)
25052505
@lock require_lock begin
2506+
if ext isa String
2507+
uuidkey = PkgId(uuid5(uuidkey.uuid, ext), ext)
2508+
end
25062509
if root_module_exists(uuidkey)
25072510
return loaded_modules[uuidkey]
25082511
end
@@ -2513,7 +2516,6 @@ function require_stdlib(uuidkey::PkgId, ext::Union{Nothing, String}=nothing)
25132516
sourcepath = normpath(env, uuidkey.name, "src", uuidkey.name * ".jl")
25142517
else
25152518
sourcepath = find_ext_path(normpath(joinpath(env, uuidkey.name)), ext)
2516-
uuidkey = PkgId(uuid5(uuidkey.uuid, ext), ext)
25172519
end
25182520
#mbypath = manifest_uuid_path(env, uuidkey)
25192521
#if mbypath isa String && isfile_casesensitive(mbypath)

0 commit comments

Comments
 (0)