diff options
| author | James Iry <jamesiry@gmail.com> | 2013-02-26 20:23:59 -0800 |
|---|---|---|
| committer | James Iry <jamesiry@gmail.com> | 2013-02-26 20:23:59 -0800 |
| commit | 4124a09379fe1784a6069f5af482bdabdb69a569 (patch) | |
| tree | c2e0c74c3dc58c61cb758d879aaa5bde3dfe2ae2 /src/compiler/scala/tools/nsc/backend/icode/GenICode.scala | |
| parent | 04b147e4a0c226526d3192b68f8efa8953b531ea (diff) | |
| download | scala-4124a09379fe1784a6069f5af482bdabdb69a569.tar.gz scala-4124a09379fe1784a6069f5af482bdabdb69a569.tar.bz2 scala-4124a09379fe1784a6069f5af482bdabdb69a569.zip | |
SI-7159 Remove erroneous INT <:< LONG in TypeKinds
TypeKinds said INT <:< LONG. But that's not true on the JVM, you need
a coercion to move up. And GenICode#adapt was checking for just that
special case.
This commit removes the INT <:< LONG rule and then removes the special
case from GenICode#adapt.
Diffstat (limited to 'src/compiler/scala/tools/nsc/backend/icode/GenICode.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/icode/GenICode.scala | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala index a76f7caba2..2b513a6fa3 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala @@ -1051,11 +1051,6 @@ abstract class GenICode extends SubComponent { case (NothingReference, _) => ctx.bb.emit(THROW(ThrowableClass)) ctx.bb.enterIgnoreMode() - // this special case is needed because of a special case in TypeKinds that - // says that the int sized primitives are subtypes of LONG - // even though they aren't according to the JVM - case (_, LONG) if from.isIntSizedType => - coerce(INT, LONG) case _ if (from <:< to) => () case (_, UNIT) => |