diff options
author | James Iry <jamesiry@gmail.com> | 2013-03-08 10:19:20 -0800 |
---|---|---|
committer | James Iry <jamesiry@gmail.com> | 2013-03-08 10:19:20 -0800 |
commit | 14d51f4044d1a7b33c161f561ba5ccce37981cbf (patch) | |
tree | e84de6ca9a2b14e2f60500c0e12a0451cdd863c8 /test/files | |
parent | 70765f6042c21f9a129a8a5877f12cb3eb76cb30 (diff) | |
parent | fd21898db304f45fa12178662c9f1e5b793d6830 (diff) | |
download | scala-14d51f4044d1a7b33c161f561ba5ccce37981cbf.tar.gz scala-14d51f4044d1a7b33c161f561ba5ccce37981cbf.tar.bz2 scala-14d51f4044d1a7b33c161f561ba5ccce37981cbf.zip |
Merge pull request #2216 from JamesIry/master_7231
SI-7231 Fix assertion when adapting Null type to Array type
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/run/t7231.check | 2 | ||||
-rw-r--r-- | test/files/run/t7231.scala | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/test/files/run/t7231.check b/test/files/run/t7231.check new file mode 100644 index 0000000000..c1e4b6c175 --- /dev/null +++ b/test/files/run/t7231.check @@ -0,0 +1,2 @@ +null +null 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 |