Include review comments and move obsolete DLLs out of depot

Author: Liozou

base/file.jl

@@ -253,9 +253,9 @@ function mkpath(path::AbstractString; mode::Integer = 0o777)
     return path
 end
 
-# Files that were requested to be deleted but can't be by the current process
-# i.e. loaded DLLs on Windows
-delayed_delete_list() = joinpath(tempdir(), "julia_delayed_deletes.txt")
+# Files that were requested to be deleted but can't be by the current process,
+# i.e. loaded DLLs on Windows, are listed in the directory below
+delayed_delete_ref() = joinpath(tempdir(), "julia_delayed_deletes_ref")
 
 """
     rm(path::AbstractString; force::Bool=false, recursive::Bool=false)
@@ -278,24 +278,17 @@ Stacktrace:
 [...]
 ```
 """
-function rm(path::AbstractString; force::Bool=false, recursive::Bool=false)
+function rm(path::AbstractString; force::Bool=false, recursive::Bool=false, allow_delayed_delete::Bool=true)
+    # allow_delayed_delete is used by Pkg.gc() but is otherwise not part of the public API
     if islink(path) || !isdir(path)
         try
             unlink(path)
         catch err
             if isa(err, IOError)
                 force && err.code==Base.UV_ENOENT && return
                 @static if Sys.iswindows()
-                    if err.code==Base.UV_EACCES && endswith(path, ".dll")
-                        # Loaded DLLs cannot be deleted on Windows, even with posix delete mode
-                        # but they can be renamed. Do so temporarily, until later cleanup by Pkg.gc()
-                        temp_path = tempname(dirname(path), cleanup = false, suffix = string("_", basename(path)))
-                        # ensure that temp_path is on the same drive as path to avoid issue #59589
-                        @debug "Could not delete DLL most likely because it is loaded, moving to a temporary path" path temp_path
-                        Base.open(delayed_delete_list(), "a") do io
-                            println(io, abspath(temp_path)) # record the temporary path for Pkg.gc()
-                        end
-                        rename(path, temp_path) # do not call mv which could recursively call rm(path)
+                    if allow_delayed_delete && err.code==Base.UV_EACCES && endswith(path, ".dll")
+                        delayed_delete_dll(path)
                         return
                     end
                 end
@@ -331,6 +324,27 @@ function rm(path::AbstractString; force::Bool=false, recursive::Bool=false)
 end
 
 
+# Loaded DLLs cannot be deleted on Windows, even with posix delete mode but they can be renamed.
+# delayed_delete_dll(path) does so temporarily, until later cleanup by Pkg.gc().
+function delayed_delete_dll(path)
+    drive = first(splitdrive(path))
+    tmpdrive = first(splitdrive(tempdir()))
+    # in-use DLL must be kept on the same drive
+    deletedir = if drive == tmpdrive
+        joinpath(tempdir(), "julia_delayed_deletes")
+    else
+        joinpath(drive, "julia_delayed_deletes")
+    end
+    mkpath(deletedir)
+    temp_path = tempname(deletedir; cleanup=false, suffix=string("_", basename(path)))
+    @debug "Could not delete DLL most likely because it is loaded, moving to a temporary path" path temp_path
+    mkpath(delayed_delete_ref())
+    io = last(mktemp(delayed_delete_ref(); cleanup=false))
+    println(io, abspath(temp_path)) # record the temporary path for Pkg.gc()
+    close(io)
+    rename(path, temp_path) # do not call mv which could recursively call rm(path)
+end
+
 # The following use Unix command line facilities
 function checkfor_mv_cp_cptree(src::AbstractString, dst::AbstractString, txt::AbstractString;
                                                           force::Bool=false)