fix hashing of Rational{<:Integer} (fixes #25814) (#25817)

JuliaLang · Jan 30, 2018 · 9d5aebb · 9d5aebb
1 parent f11d820
commit 9d5aebb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/base/hashing2.jl b/base/hashing2.jl
@@ -155,7 +155,7 @@ function hash(x::Rational{<:BitInteger64}, h::UInt)
         den >>= pow
         pow = -pow
         if den == 1 && abs(num) < 9007199254740992
-            return hash(ldexp(Float64(num),pow))
+            return hash(ldexp(Float64(num),pow),h)
         end
     end
     h = hash_integer(den, h)

diff --git a/test/hashing.jl b/test/hashing.jl
@@ -34,6 +34,7 @@ for T = types[2:end],
     x = vals,
     a = coerce(T, x)
     @test hash(a,zero(UInt)) == invoke(hash, Tuple{Real, UInt}, a, zero(UInt))
+    @test hash(a,one(UInt)) == invoke(hash, Tuple{Real, UInt}, a, one(UInt))
 end
 
 for T = types,