Skip to content

Commit 65d842a

Browse files
committed
fix Module for Base.jl for Revise.jl
1 parent 8ac9291 commit 65d842a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

base/Base.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include(strcat(BUILDROOT, "version_git.jl")) # include($BUILDROOT/base/version_g
2323
# a slightly more verbose fashion than usual, because we're running so early.
2424
let os = ccall(:jl_get_UNAME, Any, ())
2525
if os === :Darwin || os === :Apple
26-
if Base.DARWIN_FRAMEWORK
26+
if DARWIN_FRAMEWORK
2727
push!(DL_LOAD_PATH, "@loader_path/Frameworks")
2828
end
2929
push!(DL_LOAD_PATH, "@loader_path")
@@ -312,8 +312,8 @@ a_method_to_overwrite_in_test() = inferencebarrier(1)
312312
(this::IncludeInto)(mapexpr::Function, fname::AbstractString) = include(mapexpr, this.m, fname)
313313

314314
# Compatibility with when Compiler was in Core
315-
@eval Core const Compiler = Main.Base.Compiler
316-
@eval Compiler const fl_parse = Core.Main.Base.fl_parse
315+
@eval Core const Compiler = $Base.Compiler
316+
@eval Compiler const fl_parse = $Base.fl_parse
317317

318318
# External libraries vendored into Base
319319
Core.println("JuliaSyntax/src/JuliaSyntax.jl")
@@ -329,13 +329,13 @@ if is_primary_base_module
329329
# Profiling helper
330330
# triggers printing the report and (optionally) saving a heap snapshot after a SIGINFO/SIGUSR1 profile request
331331
# Needs to be in Base because Profile is no longer loaded on boot
332-
function profile_printing_listener(cond::Base.AsyncCondition)
332+
function profile_printing_listener(cond::AsyncCondition)
333333
profile = nothing
334334
try
335335
while _trywait(cond)
336336
profile = @something(profile, require_stdlib(PkgId(UUID("9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"), "Profile")))::Module
337337
invokelatest(profile.peek_report[])
338-
if Base.get_bool_env("JULIA_PROFILE_PEEK_HEAP_SNAPSHOT", false) === true
338+
if get_bool_env("JULIA_PROFILE_PEEK_HEAP_SNAPSHOT", false) === true
339339
println(stderr, "Saving heap snapshot...")
340340
fname = invokelatest(profile.take_heap_snapshot)
341341
println(stderr, "Heap snapshot saved to `$(fname)`")
@@ -350,8 +350,8 @@ function profile_printing_listener(cond::Base.AsyncCondition)
350350
end
351351

352352
function start_profile_listener()
353-
cond = Base.AsyncCondition()
354-
Base.uv_unref(cond.handle)
353+
cond = AsyncCondition()
354+
uv_unref(cond.handle)
355355
t = errormonitor(Threads.@spawn(profile_printing_listener(cond)))
356356
atexit() do
357357
# destroy this callback when exiting
@@ -430,4 +430,4 @@ end
430430

431431
# Ensure this file is also tracked
432432
@assert !isassigned(_included_files, 1)
433-
_included_files[1] = (parentmodule(Base), abspath(@__FILE__))
433+
_included_files[1] = (@__MODULE__, abspath(@__FILE__))

0 commit comments

Comments
 (0)