Skip to content

Commit 57dbdeb

Browse files
authored
Merge branch 'master' into prevent_stack_overflow_in_type_promotion
2 parents 2756cdf + 095fc99 commit 57dbdeb

File tree

8 files changed

+12
-8
lines changed

8 files changed

+12
-8
lines changed

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2009-2024: Jeff Bezanson, Stefan Karpinski, Viral B. Shah, and other contributors: https://github.com/JuliaLang/julia/contributors
3+
Copyright (c) 2009-2025: Jeff Bezanson, Stefan Karpinski, Viral B. Shah, and other contributors: https://github.com/JuliaLang/julia/contributors
44

55
Permission is hereby granted, free of charge, to any person obtaining
66
a copy of this software and associated documentation files (the

deps/checksums/SparseArrays-72c7cac6bbf21367a3c2fbc5c50e908aea5984bb.tar.gz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/SparseArrays-72c7cac6bbf21367a3c2fbc5c50e908aea5984bb.tar.gz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
26e4ff18b3ea1be9a17f0d93b57f678a
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
411f3aaa35ae9edcd75e0e6fb9306635ee02722bdf2803cfaec4f280212a41cac683e08dcc2ca8679d0f61037057e7f4365216b82f03c7b412311f98620d78d5

src/staticdata.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3654,9 +3654,7 @@ static void jl_restore_system_image_from_stream_(ios_t *f, jl_image_t *image, jl
36543654
htable_new(&new_dt_objs, 0);
36553655
arraylist_new(&deser_sym, 0);
36563656

3657-
// in --build mode only use sysimg data, not precompiled native code
3658-
int imaging_mode = jl_generating_output() && !jl_options.incremental;
3659-
if (imaging_mode || jl_options.use_sysimage_native_code != JL_OPTIONS_USE_SYSIMAGE_NATIVE_CODE_YES || IMAGE_NATIVE_CODE_TAINTED) {
3657+
if (jl_options.use_sysimage_native_code != JL_OPTIONS_USE_SYSIMAGE_NATIVE_CODE_YES || IMAGE_NATIVE_CODE_TAINTED) {
36603658
memset(&image->fptrs, 0, sizeof(image->fptrs));
36613659
image->gvars_base = NULL;
36623660
IMAGE_NATIVE_CODE_TAINTED = 1;

stdlib/SparseArrays.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
SPARSEARRAYS_BRANCH = main
2-
SPARSEARRAYS_SHA1 = 72c7cac6bbf21367a3c2fbc5c50e908aea5984bb
2+
SPARSEARRAYS_SHA1 = ae727fe4a4881b995ee4de2c9664272dd0cb2705
33
SPARSEARRAYS_GIT_URL := https://github.com/JuliaSparse/SparseArrays.jl.git
44
SPARSEARRAYS_TAR_URL = https://api.github.com/repos/JuliaSparse/SparseArrays.jl/tarball/$1

sysimage.mk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,13 @@ $(build_private_libdir)/basecompiler.ji: $(COMPILER_SRCS)
7171
--startup-file=no --warn-overwrite=yes -g$(BOOTSTRAP_DEBUG_LEVEL) -O1 Base_compiler.jl --buildroot $(RELBUILDROOT) --dataroot $(RELDATADIR))
7272
@mv $@.tmp $@
7373

74-
$(build_private_libdir)/sys.ji: $(build_private_libdir)/basecompiler.ji $(JULIAHOME)/VERSION $(BASE_SRCS) $(STDLIB_SRCS)
74+
$(build_private_libdir)/basecompiler-o.a $(build_private_libdir)/basecompiler-bc.a: $(build_private_libdir)/basecompiler-%.a : $(COMPILER_SRCS)
75+
@$(call PRINT_JULIA, cd $(JULIAHOME)/base && \
76+
JULIA_NUM_THREADS=1 $(call spawn,$(JULIA_EXECUTABLE)) -C "$(JULIA_CPU_TARGET)" $(HEAPLIM) --output-$* $(call cygpath_w,$@).tmp \
77+
--startup-file=no --warn-overwrite=yes -g$(BOOTSTRAP_DEBUG_LEVEL) -O1 Base_compiler.jl --buildroot $(RELBUILDROOT) --dataroot $(RELDATADIR))
78+
@mv $@.tmp $@
79+
80+
$(build_private_libdir)/sys.ji: $(build_private_libdir)/basecompiler.$(SHLIB_EXT) $(JULIAHOME)/VERSION $(BASE_SRCS) $(STDLIB_SRCS)
7581
@$(call PRINT_JULIA, cd $(JULIAHOME)/base && \
7682
if ! JULIA_BINDIR=$(call cygpath_w,$(build_bindir)) WINEPATH="$(call cygpath_w,$(build_bindir));$$WINEPATH" \
7783
JULIA_NUM_THREADS=1 $(call spawn, $(JULIA_EXECUTABLE)) -g1 -O1 -C "$(JULIA_CPU_TARGET)" $(HEAPLIM) --output-ji $(call cygpath_w,$@).tmp $(JULIA_SYSIMG_BUILD_FLAGS) \

0 commit comments

Comments
 (0)