Merge branch 'master' into jb/fix46778

HISTORY.md

@@ -329,7 +329,7 @@ Language changes
   same seed) unless an explicit RNG object is used.
   See the section on the `Random` standard library below ([#40546]).
 * `Iterators.peel(itr)` now returns `nothing` when `itr` is empty instead of throwing a `BoundsError` ([#39607]).
-* Multiple successive semicolons in an array expresion were previously ignored (e.g., `[1 ;; 2] == [1 ; 2]`).
+* Multiple successive semicolons in an array expression were previously ignored (e.g., `[1 ;; 2] == [1 ; 2]`).
   This syntax is now used to separate dimensions (see **New language features**).
 
 Compiler/Runtime improvements
@@ -551,7 +551,7 @@ Standard library changes
   target; other functions — `Tar.extract`, `Tar.rewrite`, `Tar.tree_hash` — treat a hard link as a
   copy of the target file (<https://github.com/JuliaIO/Tar.jl/pull/102>).
 * The standard format generated by `Tar.create` and `Tar.rewrite` now includes entries for non-empty
-  directories; this shouldn't be neccessary, but some tools that consume tarballs (including docker)
+  directories; this shouldn't be necessary, but some tools that consume tarballs (including docker)
   are confused by the absence of these directory entries (<https://github.com/JuliaIO/Tar.jl/pull/106>).
 * `Tar` now accepts tarballs with leading spaces in octal integer header fields: this is technically
   not a valid format according to the POSIX spec, but old Solaris `tar` commands produced tarballs like
@@ -2101,7 +2101,7 @@ Language changes
   * Juxtaposing binary, octal, and hexadecimal literals is deprecated, since it can lead to
     confusing code such as `0xapi == 0xa * pi` ([#16356]).
 
-  * Numeric literal juxtaposition now has slighty lower precedence than unary operators,
+  * Numeric literal juxtaposition now has slightly lower precedence than unary operators,
     so for example `√2x` parses as `(√2) * x` ([#27641]).
 
   * Declaring arguments as `x::ANY` to avoid specialization has been replaced
@@ -5168,7 +5168,7 @@ Library improvements
       for scalar indices to support indexing; all other indexing behaviors
       (including logical indexing, ranges of indices, vectors, colons, etc.) are
       implemented in default fallbacks. Similarly, they only need to implement
-      scalar `setindex!` to support all forms of indexed assingment ([#10525]).
+      scalar `setindex!` to support all forms of indexed assignment ([#10525]).
 
     * AbstractArrays that do not extend `similar` now return an `Array` by
       default ([#10525]).
@@ -5197,7 +5197,7 @@ Library improvements
   * New types
 
     * Enums are now supported through the `@enum EnumName EnumValue1
-      EnumValue2` syntax. Enum member values also support abitrary
+      EnumValue2` syntax. Enum member values also support arbitrary
       value assignment by the `@enum EnumName EnumValue1=1
       EnumValue2=10 EnumValue3=20` syntax ([#10168]).
 

Make.inc

@@ -452,8 +452,8 @@ JULIACODEGEN := LLVM
 ifeq ($(FORCE_ASSERTIONS), 1)
 # C++ code needs to include LLVM header with the same assertion flag as LLVM
 # Use this flag to re-enable assertion in our code after all the LLVM headers are included
-CXX_DISABLE_ASSERTION :=
-DISABLE_ASSERTIONS :=
+CXX_DISABLE_ASSERTION := -DJL_VERIFY_PASSES
+DISABLE_ASSERTIONS := -DJL_VERIFY_PASSES
 else
 CXX_DISABLE_ASSERTION := -DJL_NDEBUG
 DISABLE_ASSERTIONS := -DNDEBUG -DJL_NDEBUG
@@ -1478,13 +1478,19 @@ else
 LIBGCC_NAME := libgcc_s_seh-1.$(SHLIB_EXT)
 endif
 endif
+# On macOS, libgcc_s has soversion 1.1 always on aarch64 and only for GCC 12+
+# (-> libgfortran 5) on x86_64
 ifeq ($(OS),Darwin)
 ifeq ($(ARCH),aarch64)
 LIBGCC_NAME := libgcc_s.1.1.$(SHLIB_EXT)
 else
+ifeq ($(LIBGFORTRAN_VERSION),5)
+LIBGCC_NAME := libgcc_s.1.1.$(SHLIB_EXT)
+else
 LIBGCC_NAME := libgcc_s.1.$(SHLIB_EXT)
 endif
 endif
+endif
 ifneq ($(findstring $(OS),Linux FreeBSD),)
 LIBGCC_NAME := libgcc_s.$(SHLIB_EXT).1
 endif

NEWS.md

@@ -9,6 +9,7 @@ New language features
   handled via `Base.split_rest`. ([#42902])
 * Character literals now support the same syntax allowed in string literals; i.e. the syntax can
   represent invalid UTF-8 sequences as allowed by the `Char` type ([#44989]).
+* Support for Unicode 15 ([#47392]).
 * Nested combinations of tuples and named tuples of symbols are now allowed as type parameters ([#46300]).
 
 Language changes
@@ -78,6 +79,8 @@ New library functions
 * New function `stack(x)` which generalises `reduce(hcat, x::Vector{<:Vector})` to any dimensionality,
   and allows any iterators of iterators. Method `stack(f, x)` generalises `mapreduce(f, hcat, x)` and
   is efficient. ([#43334])
+* New macro `@allocations` which is similar to `@allocated` except reporting the total number of allocations
+  rather than the total size of memory allocated. ([#47367])
 
 Library changes
 ---------------
@@ -94,6 +97,7 @@ Library changes
   a `Slices` object, which allows dispatching to provide more efficient methods ([#32310]).
 * `@kwdef` is now exported and added to the public API ([#46273])
 * An issue with order of operations in `fld1` is now fixed ([#28973]).
+* Sorting is now always stable by default as `QuickSort` was stabilized in ([#45222]).
 
 Standard library changes
 ------------------------

base/Makefile

@@ -215,11 +215,19 @@ else ifneq ($(USE_SYSTEM_OPENLIBM),0)
 $(eval $(call symlink_system_library,OPENLIBM,$(LIBMNAME)))
 endif
 
-ifeq ($(APPLE_ARCH),arm64)
+# On macOS, libgcc_s has soversion 1.1 always on aarch64 and only for GCC 12+
+# (-> libgfortran 5) on x86_64
+ifeq ($(OS),Darwin)
+ifeq ($(ARCH),aarch64)
+$(eval $(call symlink_system_library,CSL,libgcc_s,1.1))
+else
+ifeq ($(LIBGFORTRAN_VERSION),5)
 $(eval $(call symlink_system_library,CSL,libgcc_s,1.1))
 else
 $(eval $(call symlink_system_library,CSL,libgcc_s,1))
 endif
+endif
+endif
 ifneq (,$(LIBGFORTRAN_VERSION))
 $(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION)))
 endif