Merge pull request #35598 from goretkin/hash-offsetarray

Allow hashing 1D OffsetArrays

Author: mbauman

base/abstractarray.jl

@@ -2208,6 +2208,7 @@ function hash(A::AbstractArray, h::UInt)
     keyidx = last(ks)
     linidx = key_to_linear[keyidx]
     fibskip = prevfibskip = oneunit(linidx)
+    first_linear = first(LinearIndices(linear_to_key))
     n = 0
     while true
         n += 1
@@ -2217,7 +2218,7 @@ function hash(A::AbstractArray, h::UInt)
 
         # Skip backwards a Fibonacci number of indices -- this is a linear index operation
         linidx = key_to_linear[keyidx]
-        linidx <= fibskip && break
+        linidx < fibskip + first_linear && break
         linidx -= fibskip
         keyidx = linear_to_key[linidx]
 

test/hashing.jl

@@ -91,6 +91,8 @@ vals = Any[
     [-0. 0; -0. 0.], SparseMatrixCSC(2, 2, [1, 3, 3], [1, 2], [-0., -0.]),
     # issue #16364
     1:4, 1:1:4, 1:-1:0, 1.0:4.0, 1.0:1.0:4.0, range(1, stop=4, length=4),
+    # issue #35597, when `LinearIndices` does not begin at 1
+    Base.IdentityUnitRange(2:4),
     'a':'e', ['a', 'b', 'c', 'd', 'e'],
     # check that hash is still consistent with heterogeneous arrays for which - is defined
     # for some pairs and not others
@@ -102,9 +104,9 @@ for a in vals, b in vals
 end
 
 for a in vals
-    if a isa AbstractArray
-        @test hash(a) == hash(Array(a)) == hash(Array{Any}(a))
-    end
+    a isa AbstractArray || continue
+    keys(a) == keys(Array(a)) || continue
+    @test hash(a) == hash(Array(a)) == hash(Array{Any}(a))
 end
 
 vals = Any[