summaryrefslogtreecommitdiff
path: root/test/files/run
diff options
context:
space:
mode:
authorSébastien Doeraene <sjrdoeraene@gmail.com>2016-04-13 11:54:47 +0200
committerSébastien Doeraene <sjrdoeraene@gmail.com>2016-04-13 12:03:45 +0200
commit6090f53ee9ab2677f732ea5cc7144cb9684b2593 (patch)
tree283d7922bb9b39480c1ebc0655087e077d191961 /test/files/run
parent00050c6bd06928b045e583c7f15f1223faf6fbee (diff)
downloadscala-6090f53ee9ab2677f732ea5cc7144cb9684b2593.tar.gz
scala-6090f53ee9ab2677f732ea5cc7144cb9684b2593.tar.bz2
scala-6090f53ee9ab2677f732ea5cc7144cb9684b2593.zip
Remove dead-code runtime hash() methods.
ScalaRunTime had a bunch of overloads of the `hash()` method, but only the `Any` version is ever used by the codegen. Worse, their implementation was not in sync with the actual implementations in BoxesRunTime, called by the `Any` version. For example, hash(0x80000000L) != hash(0x80000000L: Any) This commit simply removes all of this dead code. Similarly, we remove BoxesRunTime.hashFromObject(), which was never called either.
Diffstat (limited to 'test/files/run')
-rw-r--r--test/files/run/hashCodeBoxesRunTime.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/files/run/hashCodeBoxesRunTime.scala b/test/files/run/hashCodeBoxesRunTime.scala
index ba1a30f5fb..8ad94c252a 100644
--- a/test/files/run/hashCodeBoxesRunTime.scala
+++ b/test/files/run/hashCodeBoxesRunTime.scala
@@ -3,7 +3,8 @@
object Test
{
import java.{ lang => jl }
- import scala.runtime.BoxesRunTime.{ hashFromNumber, hashFromObject }
+ import scala.runtime.BoxesRunTime.hashFromNumber
+ import scala.runtime.ScalaRunTime.{ hash => hashFromAny }
def allSame[T](xs: List[T]) = assert(xs.distinct.size == 1, "failed: " + xs)
@@ -17,7 +18,7 @@ object Test
val hashes = mkNumbers(n) map hashFromNumber
allSame(hashes)
if (n >= 0) {
- val charCode = hashFromObject(n.toChar: Character)
+ val charCode = hashFromAny(n.toChar: Character)
assert(charCode == hashes.head)
}
}