annotate global non-const variables in bundled jlls with types (#49542)

JuliaLang · Apr 28, 2023 · ee7538e · ee7538e
1 parent ced696d
commit ee7538e
Show file tree

Hide file tree

Showing 21 changed files with 93 additions and 93 deletions.
diff --git a/stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl b/stdlib/CompilerSupportLibraries_jll/src/CompilerSupportLibraries_jll.jl
@@ -14,13 +14,13 @@ export libgfortran, libstdcxx, libgomp
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libgfortran_handle = C_NULL
-libgfortran_path = ""
-libstdcxx_handle = C_NULL
-libstdcxx_path = ""
-libgomp_handle = C_NULL
-libgomp_path = ""
+artifact_dir::String = ""
+libgfortran_handle::Ptr{Cvoid} = C_NULL
+libgfortran_path::String = ""
+libstdcxx_handle::Ptr{Cvoid} = C_NULL
+libstdcxx_path::String = ""
+libgomp_handle::Ptr{Cvoid} = C_NULL
+libgomp_path::String = ""
 
 if Sys.iswindows()
     if arch(HostPlatform()) == "x86_64"

diff --git a/stdlib/GMP_jll/src/GMP_jll.jl b/stdlib/GMP_jll/src/GMP_jll.jl
@@ -13,11 +13,11 @@ export libgmp, libgmpxx
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libgmp_handle = C_NULL
-libgmp_path = ""
-libgmpxx_handle = C_NULL
-libgmpxx_path = ""
+artifact_dir::String = ""
+libgmp_handle::Ptr{Cvoid} = C_NULL
+libgmp_path::String = ""
+libgmpxx_handle::Ptr{Cvoid} = C_NULL
+libgmpxx_path::String = ""
 
 if Sys.iswindows()
     const libgmp = "libgmp-10.dll"

diff --git a/stdlib/LLD_jll/src/LLD_jll.jl b/stdlib/LLD_jll/src/LLD_jll.jl
@@ -14,8 +14,8 @@ export lld
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-lld_path = ""
+artifact_dir::String = ""
+lld_path::String = ""
 if Sys.iswindows()
     const lld_exe = "lld.exe"
 else

diff --git a/stdlib/LLVMLibUnwind_jll/src/LLVMLibUnwind_jll.jl b/stdlib/LLVMLibUnwind_jll/src/LLVMLibUnwind_jll.jl
@@ -14,9 +14,9 @@ export llvmlibunwind
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-llvmlibunwind_handle = C_NULL
-llvmlibunwind_path = ""
+artifact_dir::String = ""
+llvmlibunwind_handle::Ptr{Cvoid} = C_NULL
+llvmlibunwind_path::String = ""
 
 const llvmlibunwind = "libunwind"
 

diff --git a/stdlib/LibCURL_jll/src/LibCURL_jll.jl b/stdlib/LibCURL_jll/src/LibCURL_jll.jl
@@ -14,9 +14,9 @@ export libcurl
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libcurl_handle = C_NULL
-libcurl_path = ""
+artifact_dir::String = ""
+libcurl_handle::Ptr{Cvoid} = C_NULL
+libcurl_path::String = ""
 
 if Sys.iswindows()
     const libcurl = "libcurl-4.dll"

diff --git a/stdlib/LibGit2_jll/src/LibGit2_jll.jl b/stdlib/LibGit2_jll/src/LibGit2_jll.jl
@@ -14,9 +14,9 @@ export libgit2
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libgit2_handle = C_NULL
-libgit2_path = ""
+artifact_dir::String = ""
+libgit2_handle::Ptr{Cvoid} = C_NULL
+libgit2_path::String = ""
 
 if Sys.iswindows()
     const libgit2 = "libgit2.dll"

diff --git a/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl b/stdlib/LibSSH2_jll/src/LibSSH2_jll.jl
@@ -14,9 +14,9 @@ export libssh2
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libssh2_handle = C_NULL
-libssh2_path = ""
+artifact_dir::String = ""
+libssh2_handle::Ptr{Cvoid} = C_NULL
+libssh2_path::String = ""
 
 if Sys.iswindows()
     const libssh2 = "libssh2.dll"

diff --git a/stdlib/LibUV_jll/src/LibUV_jll.jl b/stdlib/LibUV_jll/src/LibUV_jll.jl
@@ -14,9 +14,9 @@ export libuv
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libuv_handle = C_NULL
-libuv_path = ""
+artifact_dir::String = ""
+libuv_handle::Ptr{Cvoid} = C_NULL
+libuv_path::String = ""
 
 if Sys.iswindows()
     const libuv = "libuv-2.dll"

diff --git a/stdlib/LibUnwind_jll/src/LibUnwind_jll.jl b/stdlib/LibUnwind_jll/src/LibUnwind_jll.jl
@@ -14,9 +14,9 @@ export libunwind
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libunwind_handle = C_NULL
-libunwind_path = ""
+artifact_dir::String = ""
+libunwind_handle::Ptr{Cvoid} = C_NULL
+libunwind_path::String = ""
 
 const libunwind = "libunwind.so.8"
 

diff --git a/stdlib/MPFR_jll/src/MPFR_jll.jl b/stdlib/MPFR_jll/src/MPFR_jll.jl
@@ -13,9 +13,9 @@ export libmpfr
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libmpfr_handle = C_NULL
-libmpfr_path = ""
+artifact_dir::String = ""
+libmpfr_handle::Ptr{Cvoid} = C_NULL
+libmpfr_path::String = ""
 
 if Sys.iswindows()
     const libmpfr = "libmpfr-6.dll"

diff --git a/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl b/stdlib/MbedTLS_jll/src/MbedTLS_jll.jl
@@ -14,13 +14,13 @@ export libmbedcrypto, libmbedtls, libmbedx509
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libmbedcrypto_handle = C_NULL
-libmbedcrypto_path = ""
-libmbedtls_handle = C_NULL
-libmbedtls_path = ""
-libmbedx509_handle = C_NULL
-libmbedx509_path = ""
+artifact_dir::String = ""
+libmbedcrypto_handle::Ptr{Cvoid} = C_NULL
+libmbedcrypto_path::String = ""
+libmbedtls_handle::Ptr{Cvoid} = C_NULL
+libmbedtls_path::String = ""
+libmbedx509_handle::Ptr{Cvoid} = C_NULL
+libmbedx509_path::String = ""
 
 if Sys.iswindows()
     const libmbedcrypto = "libmbedcrypto.dll"

diff --git a/stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl b/stdlib/OpenBLAS_jll/src/OpenBLAS_jll.jl
@@ -13,9 +13,9 @@ export libopenblas
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libopenblas_handle = C_NULL
-libopenblas_path = ""
+artifact_dir::String = ""
+libopenblas_handle::Ptr{Cvoid} = C_NULL
+libopenblas_path::String = ""
 
 if Base.USE_BLAS64
     const libsuffix = "64_"

diff --git a/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl b/stdlib/OpenLibm_jll/src/OpenLibm_jll.jl
@@ -13,9 +13,9 @@ export libopenlibm
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libopenlibm_handle = C_NULL
-libopenlibm_path = ""
+artifact_dir::String = ""
+libopenlibm_handle::Ptr{Cvoid} = C_NULL
+libopenlibm_path::String = ""
 
 if Sys.iswindows()
     const libopenlibm = "libopenlibm.dll"

diff --git a/stdlib/PCRE2_jll/src/PCRE2_jll.jl b/stdlib/PCRE2_jll/src/PCRE2_jll.jl
@@ -13,9 +13,9 @@ export libpcre2_8
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libpcre2_8_handle = C_NULL
-libpcre2_8_path = ""
+artifact_dir::String = ""
+libpcre2_8_handle::Ptr{Cvoid} = C_NULL
+libpcre2_8_path::String = ""
 
 if Sys.iswindows()
     const libpcre2_8 = "libpcre2-8-0.dll"

diff --git a/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl b/stdlib/SuiteSparse_jll/src/SuiteSparse_jll.jl
@@ -14,31 +14,31 @@ export libamd, libbtf, libcamd, libccolamd, libcholmod, libcolamd, libklu, libld
 # Man I can't wait until these are automatically handled by an in-Base JLLWrappers clone.
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libamd_handle = C_NULL
-libamd_path = ""
-libbtf_handle = C_NULL
-libbtf_path = ""
-libcamd_handle = C_NULL
-libcamd_path = ""
-libccolamd_handle = C_NULL
-libccolamd_path = ""
-libcholmod_handle = C_NULL
-libcholmod_path = ""
-libcolamd_handle = C_NULL
-libcolamd_path = ""
-libklu_handle = C_NULL
-libklu_path = ""
-libldl_handle = C_NULL
-libldl_path = ""
-librbio_handle = C_NULL
-librbio_path = ""
-libspqr_handle = C_NULL
-libspqr_path = ""
-libsuitesparseconfig_handle = C_NULL
-libsuitesparseconfig_path = ""
-libumfpack_handle = C_NULL
-libumfpack_path = ""
+artifact_dir::String = ""
+libamd_handle::Ptr{Cvoid} = C_NULL
+libamd_path::String = ""
+libbtf_handle::Ptr{Cvoid} = C_NULL
+libbtf_path::String = ""
+libcamd_handle::Ptr{Cvoid} = C_NULL
+libcamd_path::String = ""
+libccolamd_handle::Ptr{Cvoid} = C_NULL
+libccolamd_path::String = ""
+libcholmod_handle::Ptr{Cvoid} = C_NULL
+libcholmod_path::String = ""
+libcolamd_handle::Ptr{Cvoid} = C_NULL
+libcolamd_path::String = ""
+libklu_handle::Ptr{Cvoid} = C_NULL
+libklu_path::String = ""
+libldl_handle::Ptr{Cvoid} = C_NULL
+libldl_path::String = ""
+librbio_handle::Ptr{Cvoid} = C_NULL
+librbio_path::String = ""
+libspqr_handle::Ptr{Cvoid} = C_NULL
+libspqr_path::String = ""
+libsuitesparseconfig_handle::Ptr{Cvoid} = C_NULL
+libsuitesparseconfig_path::String = ""
+libumfpack_handle::Ptr{Cvoid} = C_NULL
+libumfpack_path::String = ""
 
 if Sys.iswindows()
     const libamd = "libamd.dll"

diff --git a/stdlib/Zlib_jll/src/Zlib_jll.jl b/stdlib/Zlib_jll/src/Zlib_jll.jl
@@ -13,9 +13,9 @@ export libz
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libz_handle = C_NULL
-libz_path = ""
+artifact_dir::String = ""
+libz_handle::Ptr{Cvoid} = C_NULL
+libz_path::String = ""
 
 if Sys.iswindows()
     const libz = "libz.dll"

diff --git a/stdlib/dSFMT_jll/src/dSFMT_jll.jl b/stdlib/dSFMT_jll/src/dSFMT_jll.jl
@@ -14,9 +14,9 @@ export libdSFMT
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libdSFMT_handle = C_NULL
-libdSFMT_path = ""
+artifact_dir::String = ""
+libdSFMT_handle::Ptr{Cvoid} = C_NULL
+libdSFMT_path::String = ""
 
 if Sys.iswindows()
     const libdSFMT = "libdSFMT.dll"

diff --git a/stdlib/libLLVM_jll/src/libLLVM_jll.jl b/stdlib/libLLVM_jll/src/libLLVM_jll.jl
@@ -14,9 +14,9 @@ export libLLVM
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libLLVM_handle = C_NULL
-libLLVM_path = ""
+artifact_dir::String = ""
+libLLVM_handle::Ptr{Cvoid} = C_NULL
+libLLVM_path::String = ""
 
 if Sys.iswindows()
     const libLLVM = "$(Base.libllvm_name).dll"

diff --git a/stdlib/libblastrampoline_jll/src/libblastrampoline_jll.jl b/stdlib/libblastrampoline_jll/src/libblastrampoline_jll.jl
@@ -14,9 +14,9 @@ export libblastrampoline
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libblastrampoline_handle = C_NULL
-libblastrampoline_path = ""
+artifact_dir::String = ""
+libblastrampoline_handle::Ptr{Cvoid} = C_NULL
+libblastrampoline_path::String = ""
 
 # NOTE: keep in sync with `Base.libblas_name` and `Base.liblapack_name`.
 const libblastrampoline = if Sys.iswindows()

diff --git a/stdlib/nghttp2_jll/src/nghttp2_jll.jl b/stdlib/nghttp2_jll/src/nghttp2_jll.jl
@@ -13,9 +13,9 @@ export libnghttp2
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-libnghttp2_handle = C_NULL
-libnghttp2_path = ""
+artifact_dir::String = ""
+libnghttp2_handle::Ptr{Cvoid} = C_NULL
+libnghttp2_path::String = ""
 
 if Sys.iswindows()
     const libnghttp2 = "libnghttp2-14.dll"

diff --git a/stdlib/p7zip_jll/src/p7zip_jll.jl b/stdlib/p7zip_jll/src/p7zip_jll.jl
@@ -13,8 +13,8 @@ export p7zip
 # These get calculated in __init__()
 const PATH = Ref("")
 const LIBPATH = Ref("")
-artifact_dir = ""
-p7zip_path = ""
+artifact_dir::String = ""
+p7zip_path::String = ""
 if Sys.iswindows()
     const p7zip_exe = "7z.exe"
 else