summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2012-12-05 16:44:53 +0100
committerJason Zaugg <jzaugg@gmail.com>2012-12-05 16:44:53 +0100
commit8434922d6f0ead95a2109a5e41f4db4136449e93 (patch)
tree890af18c98fe91e6d37db66654ac5642cd424182 /test/files/neg
parent31a0aa75cf9739b2ae565d634670f6c0ce89bbc1 (diff)
downloadscala-8434922d6f0ead95a2109a5e41f4db4136449e93.tar.gz
scala-8434922d6f0ead95a2109a5e41f4db4136449e93.tar.bz2
scala-8434922d6f0ead95a2109a5e41f4db4136449e93.zip
Addtional test cases for tail calls in catches.
- Includes a run test to check bytecode verifies and behaves - Show this isn't possible when try is used as an expression, and a `liftedTree` local method is needed.
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/t1672b.check5
-rw-r--r--test/files/neg/t1672b.scala11
2 files changed, 15 insertions, 1 deletions
diff --git a/test/files/neg/t1672b.check b/test/files/neg/t1672b.check
index 288e47c315..60ccf77174 100644
--- a/test/files/neg/t1672b.check
+++ b/test/files/neg/t1672b.check
@@ -10,4 +10,7 @@ t1672b.scala:29: error: could not optimize @tailrec annotated method boz: it con
t1672b.scala:34: error: could not optimize @tailrec annotated method bez: it contains a recursive call not in tail position
def bez : Nothing = {
^
-four errors found
+t1672b.scala:46: error: could not optimize @tailrec annotated method bar: it contains a recursive call not in tail position
+ else 1 + (try {
+ ^
+5 errors found
diff --git a/test/files/neg/t1672b.scala b/test/files/neg/t1672b.scala
index 7d02ddc710..0ccdd03633 100644
--- a/test/files/neg/t1672b.scala
+++ b/test/files/neg/t1672b.scala
@@ -38,4 +38,15 @@ object Test {
???
}
}
+
+ // the `liftedTree` local method will prevent a tail call here.
+ @annotation.tailrec
+ def bar(i : Int) : Int = {
+ if (i == 0) 0
+ else 1 + (try {
+ throw new RuntimeException
+ } catch {
+ case _: Throwable => bar(i - 1)
+ })
+ }
}