Skip to content

Fix broadcast error when eltype is inconsistent with getindex #39185

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 3 commits into from
Jan 29, 2021
Merged

Fix broadcast error when eltype is inconsistent with getindex #39185

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ae27c5
Fix broadcast error when eltype is inconsistent with getindex
nalimilan Jan 10, 2021
891b442
whitespace
mbauman Jan 11, 2021
bf6e9ef
Update test/broadcast.jl
nalimilan Jan 17, 2021
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 base/broadcast.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ const NonleafHandlingStyles = Union{DefaultArrayStyle,ArrayConflict}
# Now handle the remaining values
# The typeassert gives inference a helping hand on the element type and dimensionality
# (work-around for #28382)
ElType′ = ElType <: Type ? Type : ElType
ElType′ = ElType === Union{} ? Any : ElType <: Type ? Type : ElType
RT = dest isa AbstractArray ? AbstractArray{<:ElType′, ndims(dest)} : Any
return copyto_nonleaf!(dest, bc′, iter, state, 1)::RT
end
Expand Down
15 changes: 15 additions & 0 deletions test/broadcast.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,3 +990,18 @@ p0 = copy(p)
@test isequal(identity.(Vector{<:Union{Int, Missing}}[[1, 2],[missing, 1]]),
[[1, 2],[missing, 1]])
end

@testset "Issue #28382: eltype inconsistent with getindex" begin
struct Cyclotomic <: Number
end

Base.getindex(x::Cyclotomic, i::Integer) = i

Base.length(x::Cyclotomic) = 1
Base.eltype(::Type{<:Cyclotomic}) = Tuple{Int,Int}

Base.:*(c::T, x::Cyclotomic) where {T<:Real} = [1, 2]
Base.:*(x::Cyclotomic, c::T) where {T<:Real} = [1, 2]

@test Cyclotomic() .* [2, 3] == [[1, 2], [1, 2]]
end