Revert "Fix for ## inconsistency."

This reverts commit 58bb2d1bd2000ac3aa2c64b6c5dc56c91e911860.

I guess this must be what's failing the nightly.

2 files changed, 4 insertions, 12 deletions

diff --git a/src/library/scala/runtime/ScalaRunTime.scala b/src/library/scala/runtime/ScalaRunTime.scala
index a04fd23710..4c5e0e408b 100644
--- a/src/library/scala/runtime/ScalaRunTime.scala
+++ b/src/library/scala/runtime/ScalaRunTime.scala
@@ -234,13 +234,10 @@ object ScalaRunTime {
   // Note that these are the implementations called by ##, so they
   // must not call ## themselves.
 
-  @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(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(dv: Double): Int = {
     val iv = dv.toInt
diff --git a/test/files/run/hashhash.scala b/test/files/run/hashhash.scala
index dc31df8cfa..b9cec99a12 100644
--- a/test/files/run/hashhash.scala
+++ b/test/files/run/hashhash.scala
@@ -6,10 +6,5 @@ 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)))
   }
 }