Excise Random from the system image

Author: vchuravy

base/Base.jl

@@ -470,6 +470,9 @@ include("util.jl")
 include("client.jl")
 include("asyncmap.jl")
 
+# excised stdlib stubs
+include("stubs.jl")
+
 # deprecated functions
 include("deprecated.jl")
 #
@@ -621,7 +624,7 @@ end
 # enable threads support
 @eval PCRE PCRE_COMPILE_LOCK = Threads.SpinLock()
 
-end
+end # is_primary_base_module
 
 # Ensure this file is also tracked
 @assert !isassigned(_included_files, 1)

base/stubs.jl

@@ -0,0 +1,40 @@
+module Stubs
+
+module Random
+    let Random_PkgID = Base.PkgId(Base.UUID(0x9a3f8284_a2c9_5f02_9a11_845980a1fd5c), "Random")
+        RANDOM_MODULE_REF = Ref{Module}()
+        
+        global delay_initialize
+        function delay_initialize()
+            if !isassigned(RANDOM_MODULE_REF)
+                RANDOM_MODULE_REF[] = require(Random_PkgID)
+            end
+            return ccall(:jl_module_world, Csize_t, (Any,), RANDOM_MODULE_REF[])
+        end
+    end
+
+    function Base.rand(args...)
+        Base.invoke_in_world(delay_initialize(), rand, args...)
+    end
+
+    function Base.randn(args...)
+        Base.invoke_in_world(delay_initialize(), rand, args...)
+    end
+end
+
+function delete_stubs(mod)
+    for name in names(mod)
+        if name == :delay_initialize
+            continue
+        end
+        obj = getglobal(Base.Stubs.Randomod, name)
+        if obj isa Function
+            ms = Base.methods(obj, mod)
+            for m in ms
+                Base.delete_method(m)
+            end
+        end
+    end
+end
+
+end

base/sysimg.jl

@@ -34,7 +34,6 @@ let
         :FileWatching, # used by loading.jl -- implicit assumption that init runs
         :Libdl, # Transitive through LinAlg
         :Artifacts, # Transitive through LinAlg
-        :SHA, # transitive through Random
         :Sockets, # used by stream.jl
 
         # Transitive through LingAlg
@@ -43,7 +42,6 @@ let
 
         # 1-depth packages
         :LinearAlgebra, # Commits type-piracy and GEMM
-        :Random, # Can't be removed due to rand being exported by Base
     ]
     # PackageCompiler can filter out stdlibs so it can be empty
     maxlen = maximum(textwidth.(string.(stdlibs)); init=0)

src/jl_exported_funcs.inc

@@ -353,6 +353,7 @@
     XX(jl_new_method_table) \
     XX(jl_new_method_uninit) \
     XX(jl_new_module) \
+    XX(jl_module_world) \
     XX(jl_new_primitivetype) \
     XX(jl_new_struct) \
     XX(jl_new_structt) \

src/julia.h

@@ -1737,6 +1737,7 @@ extern JL_DLLIMPORT jl_module_t *jl_base_module JL_GLOBALLY_ROOTED;
 extern JL_DLLIMPORT jl_module_t *jl_top_module JL_GLOBALLY_ROOTED;
 extern JL_DLLIMPORT jl_module_t *jl_libdl_module JL_GLOBALLY_ROOTED;
 JL_DLLEXPORT jl_module_t *jl_new_module(jl_sym_t *name, jl_module_t *parent);
+JL_DLLEXPORT size_t jl_module_world(jl_module_t *m);
 JL_DLLEXPORT void jl_set_module_nospecialize(jl_module_t *self, int on);
 JL_DLLEXPORT void jl_set_module_optlevel(jl_module_t *self, int lvl);
 JL_DLLEXPORT int jl_get_module_optlevel(jl_module_t *m);

src/module.c

@@ -64,6 +64,11 @@ uint32_t jl_module_next_counter(jl_module_t *m)
     return jl_atomic_fetch_add(&m->counter, 1);
 }
 
+JL_DLLEXPORT size_t jl_module_world(jl_module_t *m)
+{
+    return m->primary_world;
+}
+
 JL_DLLEXPORT jl_value_t *jl_f_new_module(jl_sym_t *name, uint8_t std_imports, uint8_t default_names)
 {
     // TODO: should we prohibit this during incremental compilation?

stdlib/Random/src/RNGs.jl

@@ -402,12 +402,6 @@ function seed!(seed=nothing)
     seed!(default_rng(), seed)
 end
 
-function __init__()
-    seed!()
-    ccall(:jl_gc_init_finalizer_rng_state, Cvoid, ())
-end
-
-
 ### generation
 
 # MersenneTwister produces natively Float64

stdlib/Random/src/Random.jl

@@ -31,6 +31,30 @@ export rand!, randn!,
 
 ## general definitions
 
+# Remove the shim methods
+# TODO: If we could support this as part of package loading
+#       That would be much nicer.
+# for m in Base.methods(rand)
+#     if m.module == Base
+#         Base.delete_method(m)
+#     end
+# end
+
+function __init__()
+    seed!()
+    ccall(:jl_gc_init_finalizer_rng_state, Cvoid, ())
+
+    # Remove the shim methods
+    # Is this too coarse? We want to only delete the method
+    # in Base, not any added by the user later on.
+    # We are currently not allowed to run this during any precompilation
+    # so we must guard it until "normal runtime".
+    # TODO: What to do when we are including Random into a sysimg.
+    if !Base.generating_output()
+        Base.Stubs.delete_stubs(Base.Stubs.Random)
+    end
+end
+
 """
     AbstractRNG
 

stdlib/stdlib.mk

@@ -1,12 +1,12 @@
 STDLIBS_WITHIN_SYSIMG := \
-	Artifacts FileWatching Libdl SHA libblastrampoline_jll OpenBLAS_jll Random \
+	Artifacts FileWatching Libdl libblastrampoline_jll OpenBLAS_jll \
 	LinearAlgebra Sockets
 
 INDEPENDENT_STDLIBS := \
 	ArgTools Base64 CRC32c Dates DelimitedFiles Distributed Downloads Future \
 	InteractiveUtils LazyArtifacts LibGit2 LibCURL Logging Markdown Mmap \
-	NetworkOptions Profile Printf Pkg REPL Serialization SharedArrays SparseArrays \
-	Statistics Tar Test TOML Unicode UUIDs \
+	NetworkOptions Profile Printf Pkg Random REPL Serialization SharedArrays \
+	SparseArrays Statistics SHA Tar Test TOML Unicode UUIDs \
 	dSFMT_jll GMP_jll libLLVM_jll LLD_jll LLVMLibUnwind_jll LibUnwind_jll LibUV_jll \
 	LibCURL_jll LibSSH2_jll LibGit2_jll nghttp2_jll  MozillaCACerts_jll MbedTLS_jll \
 	MPFR_jll OpenLibm_jll PCRE2_jll p7zip_jll Zlib_jll