From b31dcbdcf503b96536ed4b538d5a3eb14431f785 Mon Sep 17 00:00:00 2001 From: Iulian Dragos Date: Wed, 26 Nov 2008 18:58:03 +0000 Subject: Fixed 1541. --- src/compiler/scala/tools/nsc/transform/TailCalls.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/compiler') diff --git a/src/compiler/scala/tools/nsc/transform/TailCalls.scala b/src/compiler/scala/tools/nsc/transform/TailCalls.scala index 3c174d9b97..582b632d32 100644 --- a/src/compiler/scala/tools/nsc/transform/TailCalls.scala +++ b/src/compiler/scala/tools/nsc/transform/TailCalls.scala @@ -253,8 +253,12 @@ abstract class TailCalls extends Transform isRecursiveCall(fun)) { fun match { case Select(receiver, _) => - // make sure the type of 'this' doesn't change through this recursive call - if (!forMSIL && (receiver.tpe.widen == ctx.currentMethod.enclClass.typeOfThis)) + val recTpe = receiver.tpe.widen + val enclTpe = ctx.currentMethod.enclClass.typeOfThis + // make sure the type of 'this' doesn't change through this polymorphic recursive call + if (!forMSIL && + (receiver.tpe.typeParams.isEmpty || + (receiver.tpe.widen == ctx.currentMethod.enclClass.typeOfThis))) rewriteTailCall(fun, receiver :: transformTrees(vargs, mkContext(ctx, false))) else defaultTree -- cgit v1.2.3