Skip to content
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.

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

Backports for 1.10.3 #53714

Merged
merged 29 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
8952861
Fix outdated usage of scrubbing for log test failures (#50759)
serenity4 Aug 2, 2023
801885f
[REPL] Fix typo in using/import completion (#53273)
Keno Feb 11, 2024
58b3dcb
Avoid compiler warning about redefining jl_globalref_t (#53499)
fingolfin Feb 28, 2024
996fe30
yet more atomics & cache-line fixes on work-stealing queue (#53424)
d-netto Mar 4, 2024
f191dcb
build: remove extra .a file (#53596)
inkydragon Mar 5, 2024
42477de
permit NamedTuple{<:Any, Union{}} to be created (#53516)
vtjnash Mar 9, 2024
2a49cfe
Bump CSL to 1.1.1 to fix libgomp bug (#53643)
gbaraldi Mar 9, 2024
d3c8eb9
gc scheduler synchronization fixes to 1.10 (#53661)
d-netto Mar 13, 2024
77b86fe
codegen: change tbaa of ptr_phi to tbaa_value (#53655)
gbaraldi Mar 14, 2024
7536f35
Default to the medium code model in x86 linux (#53391)
gbaraldi Mar 14, 2024
f6a3c5f
Remove some duplicates from emitted compilation traces for Julia 1.10…
kpamnany Mar 20, 2024
8c6595b
Add version string to sysimg triple (#51830)
gbaraldi Oct 24, 2023
e44f1ab
Add missing GC_POP() in emit_cfunction (#53809)
gbaraldi Mar 22, 2024
396f5d1
typeintersect: fix `UnionAll` unaliasing bug caused by innervars. (#5…
N5N3 Mar 6, 2024
c2d480c
Fix linear indexing for ReshapedArray if the parent has offset axes …
jishnub Mar 11, 2024
2baebfe
Fix the OpenBLAS checksum for Julia 1.10 (#54017)
kpamnany Apr 10, 2024
feceefe
`LazyString` in `LinearAlgebra.checksquare` error message (#53961)
jishnub Apr 5, 2024
8741c1a
Added docstring for Artifacts.jl (#52913)
jam-khan Feb 8, 2024
756c16a
🤖 [backports-release-1.10] Bump the Pkg stdlib from 70525539d to f487…
DilumAluthgeBot Apr 11, 2024
a8eedc6
switch Statistics branch to release-1.10
IanButterworth Apr 11, 2024
ba33b12
switch Tar branch to release-1.10
IanButterworth Apr 11, 2024
e386554
switch ArgTools branch to release-1.10
IanButterworth Apr 11, 2024
32b0613
switch SHA branch to release-0.7
IanButterworth Apr 12, 2024
1bf60fe
🤖 [backports-release-1.10] Bump the SHA stdlib from 2d1f84e to e1af7d…
DilumAluthgeBot Apr 12, 2024
ed94319
switch SparseArrays branch to release-1.10
IanButterworth Apr 12, 2024
3b32431
🤖 [backports-release-1.10] Bump the NetworkOptions stdlib from 0bd334…
DilumAluthgeBot Apr 12, 2024
97b0571
switch JuliaSyntax branch to release-0.4
IanButterworth Apr 12, 2024
b05a4f2
Revert "`LazyString` in `LinearAlgebra.checksquare` error message (#5…
KristofferC Apr 15, 2024
5cf5146
Revert "Default to the medium code model in x86 linux (#53391)"
KristofferC Apr 16, 2024
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
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ else ifeq ($(JULIA_BUILD_MODE),debug)
-$(INSTALL_M) $(build_libdir)/libjulia-internal-debug.dll.a $(DESTDIR)$(libdir)/
endif
-$(INSTALL_M) $(wildcard $(build_private_libdir)/*.a) $(DESTDIR)$(private_libdir)/
-rm -f $(DESTDIR)$(private_libdir)/sys-o.a

# We have a single exception; we want 7z.dll to live in private_libexecdir,
# not bindir, so that 7z.exe can find it.
Expand Down
4 changes: 2 additions & 2 deletions base/boot.jl
Original file line number Diff line number Diff line change
Expand Up @@ -624,8 +624,8 @@ eval(Core, :(NamedTuple{names}(args::Tuple) where {names} =

using .Intrinsics: sle_int, add_int

eval(Core, :(NamedTuple{names,T}(args::T) where {names, T <: Tuple} =
$(Expr(:splatnew, :(NamedTuple{names,T}), :args))))
eval(Core, :((NT::Type{NamedTuple{names,T}})(args::T) where {names, T <: Tuple} =
$(Expr(:splatnew, :NT, :args))))

# constructors for built-in types

Expand Down
2 changes: 1 addition & 1 deletion base/compiler/abstractinterpretation.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2565,7 +2565,7 @@ function refine_partial_type(@nospecialize t)
# if the first/second parameter of `NamedTuple` is known to be empty,
# the second/first argument should also be empty tuple type,
# so refine it here
return Const(NamedTuple())
return Const((;))
end
return t
end
Expand Down
19 changes: 8 additions & 11 deletions base/namedtuple.jl
Original file line number Diff line number Diff line change
Expand Up @@ -112,24 +112,24 @@ Core.NamedTuple

if nameof(@__MODULE__) === :Base

@eval function NamedTuple{names,T}(args::Tuple) where {names, T <: Tuple}
@eval function (NT::Type{NamedTuple{names,T}})(args::Tuple) where {names, T <: Tuple}
if length(args) != length(names::Tuple)
throw(ArgumentError("Wrong number of arguments to named tuple constructor."))
end
# Note T(args) might not return something of type T; e.g.
# Tuple{Type{Float64}}((Float64,)) returns a Tuple{DataType}
$(Expr(:splatnew, :(NamedTuple{names,T}), :(T(args))))
$(Expr(:splatnew, :NT, :(T(args))))
end

function NamedTuple{names, T}(nt::NamedTuple) where {names, T <: Tuple}
function (NT::Type{NamedTuple{names, T}})(nt::NamedTuple) where {names, T <: Tuple}
if @generated
Expr(:new, :(NamedTuple{names, T}),
Any[ :(let Tn = fieldtype(T, $n),
Expr(:new, :NT,
Any[ :(let Tn = fieldtype(NT, $n),
ntn = getfield(nt, $(QuoteNode(names[n])))
ntn isa Tn ? ntn : convert(Tn, ntn)
end) for n in 1:length(names) ]...)
else
NamedTuple{names, T}(map(Fix1(getfield, nt), names))
NT(map(Fix1(getfield, nt), names))
end
end

Expand All @@ -145,14 +145,11 @@ function NamedTuple{names}(nt::NamedTuple) where {names}
end
end

NamedTuple{names, T}(itr) where {names, T <: Tuple} = NamedTuple{names, T}(T(itr))
NamedTuple{names}(itr) where {names} = NamedTuple{names}(Tuple(itr))
(NT::Type{NamedTuple{names, T}})(itr) where {names, T <: Tuple} = NT(T(itr))
(NT::Type{NamedTuple{names}})(itr) where {names} = NT(Tuple(itr))

NamedTuple(itr) = (; itr...)

# avoids invalidating Union{}(...)
NamedTuple{names, Union{}}(itr::Tuple) where {names} = throw(MethodError(NamedTuple{names, Union{}}, (itr,)))

end # if Base

# Like NamedTuple{names, T} as a constructor, but omits the additional
Expand Down
9 changes: 6 additions & 3 deletions base/reshapedarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ offset_if_vec(i::Integer, axs::Tuple) = i

@inline function isassigned(A::ReshapedArrayLF, index::Int)
@boundscheck checkbounds(Bool, A, index) || return false
@inbounds ret = isassigned(parent(A), index)
indexparent = index - firstindex(A) + firstindex(parent(A))
@inbounds ret = isassigned(parent(A), indexparent)
ret
end
@inline function isassigned(A::ReshapedArray{T,N}, indices::Vararg{Int, N}) where {T,N}
Expand All @@ -241,7 +242,8 @@ end

@inline function getindex(A::ReshapedArrayLF, index::Int)
@boundscheck checkbounds(A, index)
@inbounds ret = parent(A)[index]
indexparent = index - firstindex(A) + firstindex(parent(A))
@inbounds ret = parent(A)[indexparent]
ret
end
@inline function getindex(A::ReshapedArray{T,N}, indices::Vararg{Int,N}) where {T,N}
Expand All @@ -265,7 +267,8 @@ end

@inline function setindex!(A::ReshapedArrayLF, val, index::Int)
@boundscheck checkbounds(A, index)
@inbounds parent(A)[index] = val
indexparent = index - firstindex(A) + firstindex(parent(A))
@inbounds parent(A)[indexparent] = val
val
end
@inline function setindex!(A::ReshapedArray{T,N}, val, indices::Vararg{Int,N}) where {T,N}
Expand Down
2 changes: 1 addition & 1 deletion deps/JuliaSyntax.version
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
JULIASYNTAX_BRANCH = main
JULIASYNTAX_BRANCH = release-0.4
JULIASYNTAX_SHA1 = 4f1731d6ce7c2465fc21ea245110b7a39f34658a
JULIASYNTAX_GIT_URL := https://github.com/JuliaLang/JuliaSyntax.jl.git
JULIASYNTAX_TAR_URL = https://api.github.com/repos/JuliaLang/JuliaSyntax.jl/tarball/$1

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d2ccb9b91b0700bfb5ac7c01a03b4322
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
051223ab45dce692c0bbea0755cc0057bb3322a40659c092007799932a10cc23e80ee6b88fa0d86f28af5e7fe5a455cc9fb8267c76af0cd2b425cf2718629e91

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9ebc3751d48af21e9f932cfcb3b18781
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
adeedc81fee8360d427e3870d7b7861d0e653128c59c877ab1173284f19506ff2beeea063281ced3f5411be6a25dcca7c566e16eba21b7e91bbdcb2f5de8e268

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
75f38189d82446a19495d79daf5e2ed8
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f3bddf45ae180a00f51d04b5307b993220be7ddaef01cd36bc921a19e70c8268f302d39dd08b8fe7367763fde61c05fb9dab80d5374cc029262ce3640bab5037
Loading