aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDmitry Petrashko <dark@d-d.me>2015-05-18 00:25:35 +0200
committerDmitry Petrashko <dark@d-d.me>2015-05-18 00:25:35 +0200
commit3dcb286ac40ab2c9ba7d10e984c85541e0d0a78a (patch)
tree659a44c5965926bb3a6597596d79db1f23c482e1 /src
parent0edb02b43fec0fd26cf7ed3977a489f20ab06621 (diff)
parentb033f14dc28122d2b1795f1411c7b290c5d7bc67 (diff)
downloaddotty-3dcb286ac40ab2c9ba7d10e984c85541e0d0a78a.tar.gz
dotty-3dcb286ac40ab2c9ba7d10e984c85541e0d0a78a.tar.bz2
dotty-3dcb286ac40ab2c9ba7d10e984c85541e0d0a78a.zip
Merge pull request #584 from smarter/fix/isUnbox
Fix null unboxing of primitives (fixes #582)
Diffstat (limited to 'src')
-rw-r--r--src/dotty/tools/dotc/transform/Erasure.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/transform/Erasure.scala b/src/dotty/tools/dotc/transform/Erasure.scala
index 996c480ce..36d75b149 100644
--- a/src/dotty/tools/dotc/transform/Erasure.scala
+++ b/src/dotty/tools/dotc/transform/Erasure.scala
@@ -119,7 +119,7 @@ object Erasure extends TypeTestsCasts{
object Boxing {
def isUnbox(sym: Symbol)(implicit ctx: Context) =
- sym.name == nme.unbox && (defn.ScalaBoxedClasses contains sym.owner.linkedClass)
+ sym.name == nme.unbox && (defn.ScalaValueClasses contains sym.owner.linkedClass)
def isBox(sym: Symbol)(implicit ctx: Context) =
sym.name == nme.box && (defn.ScalaValueClasses contains sym.owner.linkedClass)