From 0eb06db64b66a63d722ba580d5e94506febd9dc8 Mon Sep 17 00:00:00 2001
From: Martin Odersky <odersky@gmail.com>
Date: Tue, 11 Apr 2017 09:22:56 +0200
Subject: Handle supercalls in inner classes correctly

The previous fix was too coarse. We need to move an anonymous function
in a supercall towards the call, we just have to make sure it's not
in the directly enclosing class.
---
 compiler/src/dotty/tools/dotc/transform/LambdaLift.scala | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'compiler')

diff --git a/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
index 3880b6efb..a729368d4 100644
--- a/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
+++ b/compiler/src/dotty/tools/dotc/transform/LambdaLift.scala
@@ -143,14 +143,17 @@ class LambdaLift extends MiniPhase with IdentityDenotTransformer { thisTransform
     /** Set `liftedOwner(sym)` to `owner` if `owner` is more deeply nested
      *  than the previous value of `liftedowner(sym)`.
      */
-    def narrowLiftedOwner(sym: Symbol, owner: Symbol)(implicit ctx: Context) =
+    def narrowLiftedOwner(sym: Symbol, owner: Symbol)(implicit ctx: Context): Unit =
       if (sym.maybeOwner.isTerm &&
         owner.isProperlyContainedIn(liftedOwner(sym)) &&
-        !sym.is(InSuperCall) &&
         owner != sym) {
-        ctx.log(i"narrow lifted $sym to $owner")
-        changedLiftedOwner = true
-        liftedOwner(sym) = owner
+        if (sym.is(InSuperCall) && owner.isProperlyContainedIn(sym.enclosingClass))
+          narrowLiftedOwner(sym, sym.enclosingClass)
+        else {
+          ctx.log(i"narrow lifted $sym to $owner")
+          changedLiftedOwner = true
+          liftedOwner(sym) = owner
+        }
       }
 
     /** Mark symbol `sym` as being free in `enclosure`, unless `sym` is defined
-- 
cgit v1.2.3