Skip to content

make two globals in loading.jl into ScopedValues #56378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+23 −22
Open

make two globals in loading.jl into ScopedValues #56378

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 23 additions & 22 deletions base/loading.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ function locate_package_env(pkg::PkgId, stopenv::Union{String, Nothing}=nothing)
@goto done
end
end
if !(loading_extension || precompiling_extension)
if !(loading_extension[] || precompiling_extension[])
stopenv == env && @goto done
end
end
Expand All @@ -469,7 +469,7 @@ function locate_package_env(pkg::PkgId, stopenv::Union{String, Nothing}=nothing)
env′ = env
@goto done
end
if !(loading_extension || precompiling_extension)
if !(loading_extension[] || precompiling_extension[])
stopenv == env && break
end
end
Expand Down Expand Up @@ -1432,7 +1432,7 @@ function run_module_init(mod::Module, i::Int=1)
end

function run_package_callbacks(modkey::PkgId)
if !precompiling_extension
if !precompiling_extension[]
run_extension_callbacks(modkey)
end
assert_havelock(require_lock)
Expand Down Expand Up @@ -1571,24 +1571,24 @@ function _insert_extension_triggers(parent::PkgId, extensions::Dict{String, Any}
end
end

loading_extension::Bool = false
precompiling_extension::Bool = false
const loading_extension = ScopedValues.ScopedValue(false)
const precompiling_extension = ScopedValues.ScopedValue(false)

function run_extension_callbacks(extid::ExtensionId)
assert_havelock(require_lock)
succeeded = try
# Used by Distributed to now load extensions in the package callback
global loading_extension = true
_require_prelocked(extid.id)
@debug "Extension $(extid.id.name) of $(extid.parentid.name) loaded"
true
catch
# Try to continue loading if loading an extension errors
errs = current_exceptions()
@error "Error during loading of extension $(extid.id.name) of $(extid.parentid.name), \
use `Base.retry_load_extensions()` to retry." exception=errs
false
finally
global loading_extension = false
ScopedValues.@with loading_extension => true begin
succeeded = try
# Used by Distributed to now load extensions in the package callback
_require_prelocked(extid.id)
@debug "Extension $(extid.id.name) of $(extid.parentid.name) loaded"
true
catch
# Try to continue loading if loading an extension errors
errs = current_exceptions()
@error "Error during loading of extension $(extid.id.name) of $(extid.parentid.name), \
use `Base.retry_load_extensions()` to retry." exception=errs
false
end
end
return succeeded
end
Expand Down Expand Up @@ -3073,9 +3073,10 @@ function create_expr_cache(pkg::PkgId, input::String, output::String, output_o::
write(io.in, """
empty!(Base.EXT_DORMITORY) # If we have a custom sysimage with `EXT_DORMITORY` prepopulated
Base.track_nested_precomp($precomp_stack)
Base.precompiling_extension = $(loading_extension | isext)
Base.include_package_for_output($(pkg_str(pkg)), $(repr(abspath(input))), $(repr(depot_path)), $(repr(dl_load_path)),
$(repr(load_path)), $deps, $(repr(source_path(nothing))))
Base.ScopedValues.@with Base.precompiling_extension => $(loading_extension[] | isext) begin
Base.include_package_for_output($(pkg_str(pkg)), $(repr(abspath(input))), $(repr(depot_path)), $(repr(dl_load_path)),
$(repr(load_path)), $deps, $(repr(source_path(nothing))))
end
""")
close(io.in)
return io
Expand Down