Merge pull request #13649 from dotty-staging/fix-13586

Handle inline super prefix bindings

Author: odersky

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

@@ -548,7 +548,6 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
     var lastSelf: Symbol = NoSymbol
     var lastLevel: Int = 0
     for ((level, selfSym) <- sortedProxies) {
-      lazy val rhsClsSym = selfSym.info.widenDealias.classSymbol
       val rhs = selfSym.info.dealias match
         case info: TermRef
         if info.isStable && (lastSelf.exists || isPureExpr(inlineCallPrefix)) =>
@@ -562,7 +561,9 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
           else if lastSelf.exists then
             ref(lastSelf).outerSelect(lastLevel - level, selfSym.info)
           else
-            inlineCallPrefix
+            inlineCallPrefix match
+              case Super(_, _) => This(rhsClsSym.asClass)
+              case _ => inlineCallPrefix
       val binding = accountForOpaques(
         ValDef(selfSym.asTerm, QuoteUtils.changeOwnerOfTree(rhs, selfSym)).withSpan(selfSym.span))
       bindingsBuf += binding

tests/pos/i13586.scala

@@ -0,0 +1,5 @@
+class Foo:
+ inline def test(): Unit = this
+
+class Bar extends Foo:
+  def test(s: String) = super.test()

tests/pos/i13586/Macro_1.scala

@@ -0,0 +1,6 @@
+import scala.quoted._
+
+object Position {
+  def withPosition[T](fun: Expr[Unit => T])(using quotes: Quotes, typeOfT: Type[T]): Expr[T] =
+    '{${fun}.apply(null)}
+}

tests/pos/i13586/Test_2.scala

@@ -0,0 +1,10 @@
+class Foo {
+ inline def test(): Unit = {
+   ${ Position.withPosition[Unit]('{ _ => this }) }
+ }
+}
+
+class Bar extends Foo {
+  def test(s: String) =
+    super.test()
+}