don't use pkgimages if any includes fall in tracked path

JuliaLang · Jan 14, 2023 · 50eadde · 50eadde
1 parent 0371bf4
commit 50eadde
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/base/loading.jl b/base/loading.jl
@@ -2721,6 +2721,11 @@ end
                     return true
                 end
             end
+            tracked_path = if JLOptions().tracked_path == NULL
+                ""
+            else
+                unsafe_string(JLOptions().tracked_path)
+            end
             for chi in includes
                 f, ftime_req = chi.filename, chi.mtime
                 if !isfile(f)
@@ -2733,6 +2738,14 @@ end
                     @debug "Rejecting stale cache file $cachefile because file $f does not exist"
                     return true
                 end
+                if JLOptions().use_pkgimages != 0 && JLOptions().code_coverage == 3 && occursin(tracked_path, f)
+                    @debug "Rejecting cache file $cachefile because included file $f is being tracked by --code-coverage=@$tracked_path"
+                    return true
+                end
+                if JLOptions().use_pkgimages != 0 && JLOptions().malloc_log == 3 && occursin(tracked_path, f)
+                    @debug "Rejecting cache file $cachefile because included file $f is being tracked by --track-allocation=@$tracked_path"
+                    return true
+                end
                 ftime = mtime(f)
                 is_stale = ( ftime != ftime_req ) &&
                            ( ftime != floor(ftime_req) ) &&           # Issue #13606, PR #13613: compensate for Docker images rounding mtimes