summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2008-01-10 17:55:26 +0000
committerIulian Dragos <jaguarul@gmail.com>2008-01-10 17:55:26 +0000
commit4c05b14a7162b8c4d4088ec293708eb74f783213 (patch)
treeaddec8b0f5c48b824516a825f0538600bad1512e /src
parent779aec9f38b1ac5037141e4c4a77310f6953adf1 (diff)
downloadscala-4c05b14a7162b8c4d4088ec293708eb74f783213.tar.gz
scala-4c05b14a7162b8c4d4088ec293708eb74f783213.tar.bz2
scala-4c05b14a7162b8c4d4088ec293708eb74f783213.zip
Fixed ticket #306
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala b/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala
index 7519f28fc4..2e141e0f72 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/TypeKinds.scala
@@ -117,6 +117,7 @@ trait TypeKinds { self: ICodes =>
else (a, b) match {
case (BOXED(a1), BOXED(b1)) => if (a1 == b1) a else REFERENCE(definitions.AnyRefClass)
case (BOXED(_), REFERENCE(_)) | (REFERENCE(_), BOXED(_)) => REFERENCE(definitions.AnyRefClass)
+ case (BOXED(_), ARRAY(_)) | (ARRAY(_), BOXED(_)) => REFERENCE(definitions.AnyRefClass)
case (BYTE, INT) | (INT, BYTE) => INT
case (SHORT, INT) | (INT, SHORT) => INT
case (CHAR, INT) | (INT, CHAR) => INT