Skip to content

move trim patches to separate files, only load if trimming #58826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2025
Merged

move trim patches to separate files, only load if trimming #58826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ julia-deps: | $(DIRS) $(build_datarootdir)/julia/base $(build_datarootdir)/julia
julia-stdlib: | $(DIRS) julia-deps
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/stdlib

julia-base: julia-deps $(build_sysconfdir)/julia/startup.jl $(build_man1dir)/julia.1 $(build_datarootdir)/julia/julia-config.jl $(build_datarootdir)/julia/juliac.jl $(build_datarootdir)/julia/juliac-buildscript.jl
julia-base: julia-deps $(build_sysconfdir)/julia/startup.jl $(build_man1dir)/julia.1 $(build_datarootdir)/julia/julia-config.jl $(build_datarootdir)/julia/juliac.jl $(build_datarootdir)/julia/juliac-buildscript.jl $(build_datarootdir)/julia/juliac-trim-base.jl $(build_datarootdir)/julia/juliac-trim-stdlib.jl
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/base

julia-libccalltest: julia-deps
Expand Down
243 changes: 6 additions & 237 deletions contrib/juliac-buildscript.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# This file is a part of Julia. License is MIT: https://julialang.org/license

# Script to run in the process that generates juliac's object file output

# Run the verifier in the current world (before modifications), so that error
Expand All @@ -21,164 +23,8 @@ if Base.get_bool_env("JULIA_USE_FLISP_PARSER", false) === false
Base.JuliaSyntax.enable_in_core!()
end

# Patch methods in Core and Base

@eval Core begin
DomainError(@nospecialize(val), @nospecialize(msg::AbstractString)) = (@noinline; $(Expr(:new, :DomainError, :val, :msg)))
end

(f::Base.RedirectStdStream)(io::Core.CoreSTDOUT) = Base._redirect_io_global(io, f.unix_fd)

@eval Base begin
depwarn(msg, funcsym; force::Bool=false) = nothing
_assert_tostring(msg) = ""
reinit_stdio() = nothing
JuliaSyntax.enable_in_core!() = nothing
init_active_project() = ACTIVE_PROJECT[] = nothing
set_active_project(projfile::Union{AbstractString,Nothing}) = ACTIVE_PROJECT[] = projfile
disable_library_threading() = nothing
start_profile_listener() = nothing
invokelatest_trimmed(f, args...; kwargs...) = f(args...; kwargs...)
const invokelatest = invokelatest_trimmed
function sprint(f::F, args::Vararg{Any,N}; context=nothing, sizehint::Integer=0) where {F<:Function,N}
s = IOBuffer(sizehint=sizehint)
if context isa Tuple
f(IOContext(s, context...), args...)
elseif context !== nothing
f(IOContext(s, context), args...)
else
f(s, args...)
end
String(_unsafe_take!(s))
end
function show_typeish(io::IO, @nospecialize(T))
if T isa Type
show(io, T)
elseif T isa TypeVar
print(io, (T::TypeVar).name)
else
print(io, "?")
end
end
function show(io::IO, T::Type)
if T isa DataType
print(io, T.name.name)
if T !== T.name.wrapper && length(T.parameters) > 0
print(io, "{")
first = true
for p in T.parameters
if !first
print(io, ", ")
end
first = false
if p isa Int
show(io, p)
elseif p isa Type
show(io, p)
elseif p isa Symbol
print(io, ":")
print(io, p)
elseif p isa TypeVar
print(io, p.name)
else
print(io, "?")
end
end
print(io, "}")
end
elseif T isa Union
print(io, "Union{")
show_typeish(io, T.a)
print(io, ", ")
show_typeish(io, T.b)
print(io, "}")
elseif T isa UnionAll
print(io, T.body::Type)
print(io, " where ")
print(io, T.var.name)
end
end
show_type_name(io::IO, tn::Core.TypeName) = print(io, tn.name)

mapreduce(f::F, op::F2, A::AbstractArrayOrBroadcasted; dims=:, init=_InitialValue()) where {F, F2} =
_mapreduce_dim(f, op, init, A, dims)
mapreduce(f::F, op::F2, A::AbstractArrayOrBroadcasted...; kw...) where {F, F2} =
reduce(op, map(f, A...); kw...)

_mapreduce_dim(f::F, op::F2, nt, A::AbstractArrayOrBroadcasted, ::Colon) where {F, F2} =
mapfoldl_impl(f, op, nt, A)

_mapreduce_dim(f::F, op::F2, ::_InitialValue, A::AbstractArrayOrBroadcasted, ::Colon) where {F, F2} =
_mapreduce(f, op, IndexStyle(A), A)

_mapreduce_dim(f::F, op::F2, nt, A::AbstractArrayOrBroadcasted, dims) where {F, F2} =
mapreducedim!(f, op, reducedim_initarray(A, dims, nt), A)

_mapreduce_dim(f::F, op::F2, ::_InitialValue, A::AbstractArrayOrBroadcasted, dims) where {F,F2} =
mapreducedim!(f, op, reducedim_init(f, op, A, dims), A)

mapreduce_empty_iter(f::F, op::F2, itr, ItrEltype) where {F, F2} =
reduce_empty_iter(MappingRF(f, op), itr, ItrEltype)
mapreduce_first(f::F, op::F2, x) where {F,F2} = reduce_first(op, f(x))

_mapreduce(f::F, op::F2, A::AbstractArrayOrBroadcasted) where {F,F2} = _mapreduce(f, op, IndexStyle(A), A)
mapreduce_empty(::typeof(identity), op::F, T) where {F} = reduce_empty(op, T)
mapreduce_empty(::typeof(abs), op::F, T) where {F} = abs(reduce_empty(op, T))
mapreduce_empty(::typeof(abs2), op::F, T) where {F} = abs2(reduce_empty(op, T))
end
@eval Base.Sys begin
__init_build() = nothing
end
@eval Base.GMP begin
function __init__()
try
ccall((:__gmp_set_memory_functions, libgmp), Cvoid,
(Ptr{Cvoid},Ptr{Cvoid},Ptr{Cvoid}),
cglobal(:jl_gc_counted_malloc),
cglobal(:jl_gc_counted_realloc_with_old_size),
cglobal(:jl_gc_counted_free_with_size))
ZERO.alloc, ZERO.size, ZERO.d = 0, 0, C_NULL
ONE.alloc, ONE.size, ONE.d = 1, 1, pointer(_ONE)
catch ex
Base.showerror_nostdio(ex, "WARNING: Error during initialization of module GMP")
end
# This only works with a patched version of GMP, ignore otherwise
try
ccall((:__gmp_set_alloc_overflow_function, libgmp), Cvoid,
(Ptr{Cvoid},),
cglobal(:jl_throw_out_of_memory_error))
ALLOC_OVERFLOW_FUNCTION[] = true
catch ex
# ErrorException("ccall: could not find function...")
if typeof(ex) != ErrorException
rethrow()
end
end
end
end
@eval Base.Sort begin
issorted(itr;
lt::T=isless, by::F=identity, rev::Union{Bool,Nothing}=nothing, order::Ordering=Forward) where {T,F} =
issorted(itr, ord(lt,by,rev,order))
end
@eval Base.TOML begin
function try_return_datetime(p, year, month, day, h, m, s, ms)
return DateTime(year, month, day, h, m, s, ms)
end
function try_return_date(p, year, month, day)
return Date(year, month, day)
end
function parse_local_time(l::Parser)
h = @try parse_int(l, false)
h in 0:23 || return ParserError(ErrParsingDateTime)
_, m, s, ms = @try _parse_local_time(l, true)
# TODO: Could potentially parse greater accuracy for the
# fractional seconds here.
return try_return_time(l, h, m, s, ms)
end
function try_return_time(p, h, m, s, ms)
return Time(h, m, s, ms)
end
if Base.JLOptions().trim != 0
include(joinpath(@__DIR__, "juliac-trim-base.jl"))
end

# Load user code
Expand Down Expand Up @@ -229,85 +75,8 @@ let mod = Base.include(Main, ARGS[1])
end
end

# Additional method patches depending on whether user code loads certain stdlibs
let
find_loaded_root_module(key::Base.PkgId) = Base.maybe_root_module(key)

SparseArrays = find_loaded_root_module(Base.PkgId(
Base.UUID("2f01184e-e22b-5df5-ae63-d93ebab69eaf"), "SparseArrays"))
if SparseArrays !== nothing
@eval SparseArrays.CHOLMOD begin
function __init__()
ccall((:SuiteSparse_config_malloc_func_set, :libsuitesparseconfig),
Cvoid, (Ptr{Cvoid},), cglobal(:jl_malloc, Ptr{Cvoid}))
ccall((:SuiteSparse_config_calloc_func_set, :libsuitesparseconfig),
Cvoid, (Ptr{Cvoid},), cglobal(:jl_calloc, Ptr{Cvoid}))
ccall((:SuiteSparse_config_realloc_func_set, :libsuitesparseconfig),
Cvoid, (Ptr{Cvoid},), cglobal(:jl_realloc, Ptr{Cvoid}))
ccall((:SuiteSparse_config_free_func_set, :libsuitesparseconfig),
Cvoid, (Ptr{Cvoid},), cglobal(:jl_free, Ptr{Cvoid}))
end
end
end

Artifacts = find_loaded_root_module(Base.PkgId(
Base.UUID("56f22d72-fd6d-98f1-02f0-08ddc0907c33"), "Artifacts"))
if Artifacts !== nothing
@eval Artifacts begin
function _artifact_str(
__module__,
artifacts_toml,
name,
path_tail,
artifact_dict,
hash,
platform,
_::Val{LazyArtifacts}
) where LazyArtifacts
# If the artifact exists, we're in the happy path and we can immediately
# return the path to the artifact:
dirs = artifacts_dirs(bytes2hex(hash.bytes))
for dir in dirs
if isdir(dir)
return jointail(dir, path_tail)
end
end
error("Artifact not found")
end
end
end

Pkg = find_loaded_root_module(Base.PkgId(
Base.UUID("44cfe95a-1eb2-52ea-b672-e2afdf69b78f"), "Pkg"))
if Pkg !== nothing
@eval Pkg begin
__init__() = rand() #TODO, methods that do nothing don't get codegened
end
end

StyledStrings = find_loaded_root_module(Base.PkgId(
Base.UUID("f489334b-da3d-4c2e-b8f0-e476e12c162b"), "StyledStrings"))
if StyledStrings !== nothing
@eval StyledStrings begin
__init__() = rand()
end
end

Markdown = find_loaded_root_module(Base.PkgId(
Base.UUID("d6f4376e-aef5-505a-96c1-9c027394607a"), "Markdown"))
if Markdown !== nothing
@eval Markdown begin
__init__() = rand()
end
end

JuliaSyntaxHighlighting = find_loaded_root_module(Base.PkgId(
Base.UUID("ac6e5ff7-fb65-4e79-a425-ec3bc9c03011"), "JuliaSyntaxHighlighting"))
if JuliaSyntaxHighlighting !== nothing
@eval JuliaSyntaxHighlighting begin
__init__() = rand()
end
end
if Base.JLOptions().trim != 0
include(joinpath(@__DIR__, "juliac-trim-stdlib.jl"))
end

empty!(Core.ARGS)
Expand Down
Loading