diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2012-10-17 08:18:50 +0200 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2012-10-17 08:20:06 +0200 |
commit | 3440d1bdbda4746756fa2c905aa2cc41eadbe5cf (patch) | |
tree | 63259c1c1fc6935efc6eef6cfd7c5cb3daabf417 /test | |
parent | 25ad7876a97aafb7a33283843b05023e48cedc55 (diff) | |
download | scala-3440d1bdbda4746756fa2c905aa2cc41eadbe5cf.tar.gz scala-3440d1bdbda4746756fa2c905aa2cc41eadbe5cf.tar.bz2 scala-3440d1bdbda4746756fa2c905aa2cc41eadbe5cf.zip |
SI-6526 Tail call elimination should descend deeper.
It wasn't traversing into Select nodes nor into the receiver of
a tail call.
Diffstat (limited to 'test')
-rw-r--r-- | test/files/neg/t6526.check | 13 | ||||
-rw-r--r-- | test/files/neg/t6526.scala | 36 |
2 files changed, 49 insertions, 0 deletions
diff --git a/test/files/neg/t6526.check b/test/files/neg/t6526.check new file mode 100644 index 0000000000..f4db0cc87a --- /dev/null +++ b/test/files/neg/t6526.check @@ -0,0 +1,13 @@ +t6526.scala:8: error: could not optimize @tailrec annotated method inner: it contains a recursive call not in tail position + @tailrec def inner(i: Int): Int = 1 + inner(i) + ^ +t6526.scala:14: error: could not optimize @tailrec annotated method inner: it contains a recursive call not in tail position + @tailrec def inner(i: Int): Int = 1 + inner(i) + ^ +t6526.scala:20: error: could not optimize @tailrec annotated method inner: it contains a recursive call not in tail position + @tailrec def inner(i: Int): Int = 1 + inner(i) + ^ +t6526.scala:30: error: could not optimize @tailrec annotated method inner: it contains a recursive call not in tail position + @tailrec def inner(i: Int): Int = 1 + inner(i) + ^ +four errors found diff --git a/test/files/neg/t6526.scala b/test/files/neg/t6526.scala new file mode 100644 index 0000000000..a34ba570d0 --- /dev/null +++ b/test/files/neg/t6526.scala @@ -0,0 +1,36 @@ +import scala.annotation.tailrec + +class TailRec { + def bar(f: => Any) = "" + + // transform the qualifier of a Select + bar { + @tailrec def inner(i: Int): Int = 1 + inner(i) + inner(0) + }.length + + // transform the body of a function + () => { + @tailrec def inner(i: Int): Int = 1 + inner(i) + inner(0) + } + + // transform the qualifier of a Select + { + @tailrec def inner(i: Int): Int = 1 + inner(i) + inner(0) + "" + }.length + + // The receiver of a tail recursive call must itself be transformed + object X { + @tailrec // okay, all other annotated methods should fail. + def foo: Any = { + { + @tailrec def inner(i: Int): Int = 1 + inner(i) + inner(0) + this + }.foo + } + } +} |