wip

Author: IanButterworth

base/loading.jl

@@ -2444,7 +2444,21 @@ function compilecache(pkg::PkgId, path::String, internal_stderr::IO = stderr, in
     # create a temporary file in `cachepath` directory, write the cache in it,
     # write the checksum, _and then_ atomically move the file to `cachefile`.
     mkpath(cachepath)
-    cache_objects = JLOptions().use_pkgimages != 0
+    if JLOptions().use_pkgimages == 0
+        cache_objects = false
+    else
+        if JLOptions().tracked_path == C_NULL
+            cache_objects = true
+        else
+            tracked_path = unsafe_string(JLOptions().tracked_path)
+            # disable pkgimages if srcpath falls within a code-coverage or allocation-tracking path 
+            # TODO: disable if any includes fall within tracked_path, not just the srcpath
+            # harder because includes aren't currently known before cache generation
+            # or implement https://github.com/JuliaLang/julia/issues/51412
+            cache_objects = !startswith(path, tracked_path)
+        end
+    end
+
     tmppath, tmpio = mktemp(cachepath)
 
     if cache_objects
@@ -3170,6 +3184,7 @@ end
         if isempty(modules)
             return true # ignore empty file
         end
+        # TODO: Before merge.. Allow not matching use_pkgimages if package falls in tracked_path
         if ccall(:jl_match_cache_flags, UInt8, (UInt8,), flags) == 0
             @debug """
             Rejecting cache file $cachefile for $modkey since the flags are mismatched

src/staticdata_utils.c

@@ -599,7 +599,7 @@ JL_DLLEXPORT uint8_t jl_cache_flags(void)
 {
     // OOICCDDP
     uint8_t flags = 0;
-    flags |= (jl_options.use_pkgimages & 1); // 0-bit
+    flags |= ((jl_options.outputo == NULL || jl_options.outputo[0] == '\0') | 1); // 0-bit
     flags |= (jl_options.debug_level & 3) << 1; // 1-2 bit
     flags |= (jl_options.check_bounds & 3) << 3; // 3-4 bit
     flags |= (jl_options.can_inline & 1) << 5; // 5-bit