summaryrefslogtreecommitdiff
path: root/test/files/run/t7231.scala
diff options
context:
space:
mode:
authorJames Iry <jamesiry@gmail.com>2013-03-08 08:31:57 -0800
committerJames Iry <jamesiry@gmail.com>2013-03-08 08:31:57 -0800
commitfd21898db304f45fa12178662c9f1e5b793d6830 (patch)
treeccfb26864991002cc646adb1a11c5809584f5bfe /test/files/run/t7231.scala
parent5967a664ab1129e28687c591bd94c0e482cb305f (diff)
downloadscala-fd21898db304f45fa12178662c9f1e5b793d6830.tar.gz
scala-fd21898db304f45fa12178662c9f1e5b793d6830.tar.bz2
scala-fd21898db304f45fa12178662c9f1e5b793d6830.zip
SI-7231 Fix assertion when adapting Null type to Array type
GenICode was doing a sanity check when adapting an expression of type Null to something else. It was just doing the wrong one. Instead of checking whether the result expression type was a reference type it was checking to see if it was an class reference type. This commit fixes that and adds a test to make sure both forms of adaptation work as expected.
Diffstat (limited to 'test/files/run/t7231.scala')
-rw-r--r--test/files/run/t7231.scala11
1 files changed, 11 insertions, 0 deletions
diff --git a/test/files/run/t7231.scala b/test/files/run/t7231.scala
new file mode 100644
index 0000000000..7d6bc81f3f
--- /dev/null
+++ b/test/files/run/t7231.scala
@@ -0,0 +1,11 @@
+object Test extends App {
+ val bar: Null = null
+
+ def foo(x: Array[Int]) = x
+ def baz(x: String) = x
+
+ // first line was failing
+ println(foo(bar))
+ // this line worked but good to have a double check
+ println(baz(bar))
+} \ No newline at end of file