Skip to content

Commit 04a742f

Browse files
don't use pkgimages if any includes fall in tracked path
1 parent 708d1bd commit 04a742f

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

base/loading.jl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2645,6 +2645,7 @@ end
26452645
return true
26462646
end
26472647
end
2648+
tracked_path = unsafe_string(JLOptions().tracked_path)
26482649
for chi in includes
26492650
f, ftime_req = chi.filename, chi.mtime
26502651
if !isfile(f)
@@ -2657,6 +2658,14 @@ end
26572658
@debug "Rejecting stale cache file $cachefile because file $f does not exist"
26582659
return true
26592660
end
2661+
if JLOptions().code_coverage == 3 && occursin(tracked_path, f)
2662+
@debug "Rejecting cache file $cachefile because included file $f is being tracked by --code-coverage"
2663+
return true
2664+
end
2665+
if JLOptions().malloc_log == 3 && occursin(tracked_path, f)
2666+
@debug "Rejecting cache file $cachefile because included file $f is being tracked by --track-allocation"
2667+
return true
2668+
end
26602669
ftime = mtime(f)
26612670
is_stale = ( ftime != ftime_req ) &&
26622671
( ftime != floor(ftime_req) ) && # Issue #13606, PR #13613: compensate for Docker images rounding mtimes

0 commit comments

Comments
 (0)