summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-03-23 10:15:08 -0700
committerPaul Phillips <paulp@improving.org>2012-03-23 10:15:08 -0700
commit45eebcf98de0c6d81b167b95600bf37e7a2257bc (patch)
tree5c1622d018fd358df9b13f9d4bcaf113e7a2dcdf /test/files
parentdd2f367dc658aea30f108a8fb0f260a593b98e6e (diff)
parent20426fb137ac9dfc2fb87adaaedb0646c0413320 (diff)
downloadscala-45eebcf98de0c6d81b167b95600bf37e7a2257bc.tar.gz
scala-45eebcf98de0c6d81b167b95600bf37e7a2257bc.tar.bz2
scala-45eebcf98de0c6d81b167b95600bf37e7a2257bc.zip
Merge remote-tracking branch 'adriaanm/topic/virtpatmat' into develop
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/virtpatmat_tailcalls_verifyerror.check1
-rw-r--r--test/files/run/virtpatmat_tailcalls_verifyerror.flags1
-rw-r--r--test/files/run/virtpatmat_tailcalls_verifyerror.scala14
3 files changed, 16 insertions, 0 deletions
diff --git a/test/files/run/virtpatmat_tailcalls_verifyerror.check b/test/files/run/virtpatmat_tailcalls_verifyerror.check
new file mode 100644
index 0000000000..c508d5366f
--- /dev/null
+++ b/test/files/run/virtpatmat_tailcalls_verifyerror.check
@@ -0,0 +1 @@
+false
diff --git a/test/files/run/virtpatmat_tailcalls_verifyerror.flags b/test/files/run/virtpatmat_tailcalls_verifyerror.flags
new file mode 100644
index 0000000000..9769db9257
--- /dev/null
+++ b/test/files/run/virtpatmat_tailcalls_verifyerror.flags
@@ -0,0 +1 @@
+ -Yvirtpatmat -Xexperimental
diff --git a/test/files/run/virtpatmat_tailcalls_verifyerror.scala b/test/files/run/virtpatmat_tailcalls_verifyerror.scala
new file mode 100644
index 0000000000..5ce91e8dce
--- /dev/null
+++ b/test/files/run/virtpatmat_tailcalls_verifyerror.scala
@@ -0,0 +1,14 @@
+// shouldn't result in a verify error when run...
+object Test extends App {
+ @annotation.tailrec
+ final def test(meh: Boolean): Boolean = {
+ Some("a") match {
+ case x =>
+ x match {
+ case Some(_) => if(meh) test(false) else false
+ case _ => test(false)
+ }
+ }
+ }
+ println(test(true))
+} \ No newline at end of file