Skip to content

workspace command: fix for missing incremental support #21714

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

Merged
merged 2 commits into from
Jun 1, 2017
Merged

workspace command: fix for missing incremental support #21714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da78c3b
workspace command: fix for missing incremental support
vtjnash May 5, 2017
bf33284
Add a test for #22101
ararslan May 30, 2017
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
4 changes: 3 additions & 1 deletion src/toplevel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,10 @@ JL_DLLEXPORT jl_module_t *jl_new_main_module(void)

jl_main_module = jl_new_module(jl_symbol("Main"));
jl_main_module->parent = jl_main_module;
if (old_main) // don't block continued loading of incremental caches
if (old_main) { // don't block continued loading of incremental caches
jl_main_module->primary_world = old_main->primary_world;
jl_main_module->uuid = old_main->uuid;
}
ptls->current_module = jl_main_module;

jl_core_module->parent = jl_main_module;
Expand Down
34 changes: 34 additions & 0 deletions test/workspace.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# This file is a part of Julia. License is MIT: https://julialang.org/license

using Base.Test

script = """
# Issue #11948
f(x) = x+1
Expand All @@ -24,3 +26,35 @@ mutable struct Foo end
@assert Tuple{Type{LastMain.Foo}} !== Tuple{Type{Main.Foo}}
"""
run(`$exename --startup-file=no -e $script2`)

# Issue #22101
mktempdir() do dir
withenv("JULIA_DEBUG_LOADING" => nothing) do
# We need to ensure that the module does a nontrivial amount of work during precompilation
write(joinpath(dir, "Test22101.jl"), """
__precompile__()
module Test22101
export f22101
f22101() = collect(1:10)
f22101()
end
""")
write(joinpath(dir, "testdriver.jl"), """
insert!(LOAD_PATH, 1, $(repr(dir)))
insert!(Base.LOAD_CACHE_PATH, 1, $(repr(dir)))
try
using Test22101
f22101()
workspace()
using Test22101
finally
splice!(LOAD_PATH, 1)
splice!(Base.LOAD_CACHE_PATH, 1)
end
exit(isdefined(Main, :f22101) ? 0 : 1)
""")
# Ensure that STDIO doesn't get swallowed (helps with debugging)
cmd = `$(Base.julia_cmd()) --startup-file=no --precompiled=yes --compilecache=yes $(joinpath(dir, "testdriver.jl"))`
@test success(pipeline(cmd, stdout=STDOUT, stderr=STDERR))
end
end