diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-10-24 08:50:36 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-10-24 08:50:36 -0700 |
| commit | c0fac9ecabb7c5ea01cbb924e79aa4f14eb1e7d1 (patch) | |
| tree | 6f6c128c1dc7b3119d6c01ee2abc7a55f2fb8d41 /src/compiler/scala | |
| parent | 5b98644ff9bca3b853464f6555ed7ea9af716adf (diff) | |
| parent | ff3e57beddfec9678b5be1c6031a45e483e1dd66 (diff) | |
| download | scala-c0fac9ecabb7c5ea01cbb924e79aa4f14eb1e7d1.tar.gz scala-c0fac9ecabb7c5ea01cbb924e79aa4f14eb1e7d1.tar.bz2 scala-c0fac9ecabb7c5ea01cbb924e79aa4f14eb1e7d1.zip | |
Merge pull request #1507 from retronym/ticket/6526
SI-6526 Tail call elimination should descend deeper.
Diffstat (limited to 'src/compiler/scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/TailCalls.scala | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/TailCalls.scala b/src/compiler/scala/tools/nsc/transform/TailCalls.scala index 0ad6d6c677..c8ea43269a 100644 --- a/src/compiler/scala/tools/nsc/transform/TailCalls.scala +++ b/src/compiler/scala/tools/nsc/transform/TailCalls.scala @@ -208,7 +208,7 @@ abstract class TailCalls extends Transform { debuglog("Cannot rewrite recursive call at: " + fun.pos + " because: " + reason) ctx.failReason = reason - treeCopy.Apply(tree, target, transformArgs) + treeCopy.Apply(tree, noTailTransform(target), transformArgs) } /** Position of failure is that of the tree being considered. */ @@ -220,7 +220,7 @@ abstract class TailCalls extends Transform { debuglog("Rewriting tail recursive call: " + fun.pos.lineContent.trim) accessed += ctx.label - typedPos(fun.pos)(Apply(Ident(ctx.label), recv :: transformArgs)) + typedPos(fun.pos)(Apply(Ident(ctx.label), noTailTransform(recv) :: transformArgs)) } if (!ctx.isEligible) fail("it is neither private nor final so can be overridden") @@ -361,7 +361,9 @@ abstract class TailCalls extends Transform { case Alternative(_) | Star(_) | Bind(_, _) => sys.error("We should've never gotten inside a pattern") - case EmptyTree | Super(_, _) | This(_) | Select(_, _) | Ident(_) | Literal(_) | Function(_, _) | TypeTree() => + case Select(qual, name) => + treeCopy.Select(tree, noTailTransform(qual), name) + case EmptyTree | Super(_, _) | This(_) | Ident(_) | Literal(_) | Function(_, _) | TypeTree() => tree case _ => super.transform(tree) |