Fix "supercalls not allowed in inlined code" error logic

Author: odersky

compiler/src/dotty/tools/dotc/transform/PostTyper.scala

@@ -192,10 +192,6 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
           }
           else
             transformSelect(tree, Nil)
-        case tree: Super =>
-          if (ctx.owner.enclosingMethod.isInlineMethod)
-            ctx.error(SuperCallsNotAllowedInline(ctx.owner), tree.pos)
-          super.transform(tree)
         case tree: Apply =>
           methPart(tree) match {
             case Select(nu: New, nme.CONSTRUCTOR) if isCheckable(nu) =>

compiler/src/dotty/tools/dotc/typer/Inliner.scala

@@ -88,10 +88,11 @@ object Inliner {
     sym != inlineMethod &&
     (!sym.is(Param) || sym.owner != inlineMethod)
 
-  def isExternalReference(sym: Symbol)(implicit ctx: Context): Boolean = {
-    val inlineMethod = ctx.owner.ownersIterator.findSymbol(_.isInlineMethod)
-    sym.exists && !isLocal(sym, inlineMethod)
-  }
+  def enclosingInlineMethod(implicit ctx: Context) =
+    ctx.owner.ownersIterator.findSymbol(_.isInlineMethod)
+
+  def isExternalReference(sym: Symbol)(implicit ctx: Context): Boolean =
+    ctx.mode.is(Mode.BodyOfInlined) && sym.exists && !isLocal(sym, enclosingInlineMethod)
 
   /** Register inline info for given inline method `sym`.
    *

compiler/src/dotty/tools/dotc/typer/Typer.scala

@@ -475,8 +475,8 @@ class Typer extends Namer
       case pt: SelectionProto if pt.name == nme.CONSTRUCTOR => true
       case _ => false
     }
-    if (ctx.mode.is(Mode.BodyOfInlined) && Inliner.isExternalReference(qual1.symbol))
-      ctx.error(em"illegal super call in inlined method", tree.pos)
+    if (Inliner.isExternalReference(qual1.symbol))
+      ctx.error(SuperCallsNotAllowedInline(Inliner.enclosingInlineMethod), tree.pos)
     pt match {
       case pt: SelectionProto if pt.name.isTypeName =>
         qual1 // don't do super references for types; they are meaningless anyway