Skip to content

Commit cab3d62

Browse files
committed
foo
1 parent 7de3e22 commit cab3d62

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

Project.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
2929
CRC32c = "8bf52ea8-c179-5cab-976a-9e18b702a9bc"
3030
CatIndices = "aafaddc9-749c-510e-ac4f-586e18779b91"
3131
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
32+
Debugger = "31a5f54b-26ea-5ae9-a837-f05ce5417438"
3233
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
3334
EndpointRanges = "340492b5-2a47-5f55-813d-aca7ddf97656"
3435
EponymTuples = "97e2ac4a-e175-5f49-beb1-4d6866a6cdc3"
@@ -57,4 +58,4 @@ SuiteSparse = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9"
5758
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
5859

5960
[targets]
60-
test = ["Test", "Base64", "CRC32c", "CatIndices", "Dates", "DelimitedFiles", "EndpointRanges", "EponymTuples", "Example", "Future", "IndirectArrays", "InteractiveUtils", "Libdl", "LinearAlgebra", "Logging", "MappedArrays", "Markdown", "Mmap", "Printf", "Profile", "Random", "Requires", "RoundingIntegers", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "SuiteSparse"]
61+
test = ["Test", "Base64", "CRC32c", "CatIndices", "Dates", "DelimitedFiles", "EndpointRanges", "EponymTuples", "Example", "Future", "IndirectArrays", "InteractiveUtils", "Libdl", "LinearAlgebra", "Logging", "MappedArrays", "Markdown", "Mmap", "Printf", "Profile", "Random", "Requires", "RoundingIntegers", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "SuiteSparse", "Debugger"]

src/packagedef.jl

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,14 @@ const silence_pkgs = Set{Symbol}()
198198
const depsdir = joinpath(dirname(@__DIR__), "deps")
199199
const silencefile = Ref(joinpath(depsdir, "silence.txt")) # Ref so that tests don't clobber
200200

201-
"""
202-
Revise.worldage
203-
204-
The world age Revise was started in. Needed so that Revise doesn't delete methods
205-
from under itself.
206-
"""
207-
const worldage = Ref{Union{Nothing,UInt}}(nothing)
201+
#"""
202+
# Revise.worldage
203+
#
204+
#The world age Revise was started in. Needed so that Revise doesn't delete methods
205+
#from under itself.
206+
#"""
207+
#const worldage = Ref{Union{Nothing,UInt}}(nothing)
208+
using CodeTracking: worldage
208209

209210
##
210211
## The inputs are sets of expressions found in each file.
@@ -1190,12 +1191,16 @@ if VERSION < v"1.6.0-DEV.1162"
11901191
const lower_in_reviseworld = Meta.lower
11911192
else
11921193
function invoke_revisefunc(f, args...; kwargs...)
1194+
@show worldage[]
1195+
Base.show_backtrace(backtrace[1:2])
11931196
return Base.invoke_in_world(worldage[], f, args...; kwargs...)
11941197
end
11951198
function lower_in_reviseworld(m::Module, @nospecialize(ex))
1199+
@show worldage[]
1200+
Base.show_backtrace(backtrace[1:2])
11961201
return ccall(:jl_expand_in_world, Any,
11971202
(Any, Ref{Module}, Cstring, Cint, Csize_t),
1198-
ex, m, "none", 0, world,
1203+
ex, m, "none", 0, worldage[],
11991204
)
12001205
end
12011206
end

test/runtests.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,8 @@ end
473473
@eval @test $(fn4)() == 4
474474
@eval @test $(fn5)() == 5
475475
@eval @test $(fn6)() == 6
476-
m = @eval first(methods($fn1))
477-
rex = Revise.RelocatableExpr(definition(m))
476+
m = @show @eval first(methods($fn1))
477+
rex = Revise.RelocatableExpr(@show definition(m))
478478
@test rex == Revise.RelocatableExpr(:( $fn1() = 1 ))
479479
# Check that definition returns copies
480480
rex2 = deepcopy(rex)

0 commit comments

Comments
 (0)