Permalink
Browse files

Fix for ## inconsistency.

Hopefully without slowing things down overmuch.  Closes SI-5640.
  • Loading branch information...
paulp committed May 8, 2012
1 parent 067c256 commit 58bb2d1bd2000ac3aa2c64b6c5dc56c91e911860
Showing with 12 additions and 4 deletions.
  1. +7 −4 src/library/scala/runtime/ScalaRunTime.scala
  2. +5 −0 test/files/run/hashhash.scala
@@ -234,10 +234,13 @@ object ScalaRunTime {
// Note that these are the implementations called by ##, so they
// must not call ## themselves.
- @inline def hash(x: Any): Int =
- if (x == null) 0
- else if (x.isInstanceOf[java.lang.Number]) BoxesRunTime.hashFromNumber(x.asInstanceOf[java.lang.Number])
- else x.hashCode
+ @inline def hash(x: Any): Int = x match {
+ case null => 0
+ case x: Double => hash(x)
+ case x: Float => hash(x)
+ case x: java.lang.Number => hash(x)
+ case _ => x.hashCode
+ }
@inline def hash(dv: Double): Int = {
val iv = dv.toInt
@@ -6,5 +6,10 @@ object Test {
/** Just a little sanity check, not to be confused with a unit test. */
List(5, 5.5f, "abc", new AnyRef, ()) foreach confirmSame
List(5.0f, 1.0d, -(5.0f), (-1.0d)) foreach confirmDifferent
+
+ val x = (BigInt(1) << 64).toDouble
+ val y: Any = x
+
+ assert(x.## == y.##, ((x, y)))
}
}

0 comments on commit 58bb2d1

Please sign in to comment.