summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Doeraene <sjrdoeraene@gmail.com>2016-04-13 16:43:35 +0200
committerSébastien Doeraene <sjrdoeraene@gmail.com>2016-04-13 16:44:09 +0200
commit246cd636b0e2e5861ee93e7a18d1940d2f6f6fce (patch)
treef19b4f167871bf7e1db61e5523908f451b6d60aa
parent702e86d3ce86489a8639d0ec47eace2d6262a7a1 (diff)
downloadscala-246cd636b0e2e5861ee93e7a18d1940d2f6f6fce.tar.gz
scala-246cd636b0e2e5861ee93e7a18d1940d2f6f6fce.tar.bz2
scala-246cd636b0e2e5861ee93e7a18d1940d2f6f6fce.zip
Do not rely on ScalaRunTime.{inlineEquals,hash} in JavaMirrors.
We can use the normal Scala language constructs instead.
-rw-r--r--src/reflect/scala/reflect/runtime/JavaMirrors.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/reflect/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala
index 1dce979e79..37b07ce775 100644
--- a/src/reflect/scala/reflect/runtime/JavaMirrors.scala
+++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala
@@ -475,9 +475,9 @@ private[scala] trait JavaMirrors extends internal.SymbolTable with api.JavaUnive
}
symbol match {
- case Any_== | Object_== => ScalaRunTime.inlinedEquals(objReceiver, objArg0)
- case Any_!= | Object_!= => !ScalaRunTime.inlinedEquals(objReceiver, objArg0)
- case Any_## | Object_## => ScalaRunTime.hash(objReceiver)
+ case Any_== | Object_== => objReceiver == objArg0
+ case Any_!= | Object_!= => objReceiver != objArg0
+ case Any_## | Object_## => objReceiver.##
case Any_equals => receiver.equals(objArg0)
case Any_hashCode => receiver.hashCode
case Any_toString => receiver.toString