Fix findfirst with decreasing step range (#33809)

Fixes #33808 (cherry picked from commit 8333297)
JuliaLang · Nov 13, 2019 · 78b7402 · 78b7402
1 parent cdbd38c
commit 78b7402
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/base/array.jl b/base/array.jl
@@ -1755,7 +1755,8 @@ findfirst(testf::Function, A::Union{AbstractArray, AbstractString}) =
     findnext(testf, A, first(keys(A)))
 
 function findfirst(p::Union{Fix2{typeof(isequal),T},Fix2{typeof(==),T}}, r::StepRange{T,S}) where {T,S}
-    first(r) <= p.x <= last(r) || return nothing
+    isempty(r) && return nothing
+    minimum(r) <= p.x <= maximum(r) || return nothing
     d = convert(S, p.x - first(r))
     iszero(d % step(r)) || return nothing
     return d ÷ step(r) + 1

diff --git a/test/ranges.jl b/test/ranges.jl
@@ -305,6 +305,8 @@ end
         @test findfirst(==(7), 1:2:10) == 4
         @test findfirst(==(10), 1:2:10) == nothing
         @test findfirst(==(11), 1:2:10) == nothing
+        @test findfirst(==(-7), 1:-1:-10) == 9
+        @test findfirst(==(2),1:-1:2) == nothing
     end
     @testset "reverse" begin
         @test reverse(reverse(1:10)) == 1:10