diff options
| author | Lukas Rytz <lukas.rytz@gmail.com> | 2014-12-05 16:35:01 +0100 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@gmail.com> | 2014-12-11 16:41:19 +0100 |
| commit | 2c4ef6b8bfa87b31db79ebc9a5c2c123149f6fb8 (patch) | |
| tree | 5758c095675063087065b39e837d0d1b4151c79c /src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala | |
| parent | 124cf2f62f559caf37a5d5df7e15db7ba5958bcf (diff) | |
| download | scala-2c4ef6b8bfa87b31db79ebc9a5c2c123149f6fb8.tar.gz scala-2c4ef6b8bfa87b31db79ebc9a5c2c123149f6fb8.tar.bz2 scala-2c4ef6b8bfa87b31db79ebc9a5c2c123149f6fb8.zip | |
[nomerge] SI-9030 don't call private BoxesRunTime.equalsNumChar
When comparing a Number and a Character, the would emit a call to the
private method. For binary compatibility, this method remains private
in 2.11, so we just use equalsNumObject instead.
Diffstat (limited to 'src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala index daf36ce374..062daa4eac 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala @@ -1225,7 +1225,7 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder { val equalsMethod: Symbol = { if (l.tpe <:< BoxedNumberClass.tpe) { if (r.tpe <:< BoxedNumberClass.tpe) platform.externalEqualsNumNum - else if (r.tpe <:< BoxedCharacterClass.tpe) platform.externalEqualsNumChar + else if (r.tpe <:< BoxedCharacterClass.tpe) platform.externalEqualsNumObject // will be externalEqualsNumChar in 2.12, SI-9030 else platform.externalEqualsNumObject } else platform.externalEquals } |