summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala
diff options
context:
space:
mode:
authorJames Iry <jamesiry@gmail.com>2013-02-26 20:23:59 -0800
committerJames Iry <jamesiry@gmail.com>2013-02-26 20:23:59 -0800
commit4124a09379fe1784a6069f5af482bdabdb69a569 (patch)
treec2e0c74c3dc58c61cb758d879aaa5bde3dfe2ae2 /src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala
parent04b147e4a0c226526d3192b68f8efa8953b531ea (diff)
downloadscala-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/TypeKinds.scala')
-rw-r--r--src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala b/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala
index 1f8c765a69..266e2b861f 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala
@@ -96,9 +96,6 @@ trait TypeKinds { self: ICodes =>
// to remove it I got verify errors when compiling the library
// under -optimize
case INT => this.isIntSizedType
- // this case is even more suspect than the previous because
- // BOOL, BYTE, CHAR, SHORT, and INT need conversion to get to LONG
- case LONG => this.isIntSizedType || this == LONG
case _ => this eq other
}