Backport "Fix outerSelect in Inliner" to LTS (#21094)

Backports #20313 to the LTS branch. PR submitted by the release tooling. [skip ci]
scala · Jul 6, 2024 · 591477b · 591477b
2 parents 02d48c1 + 319d2c6
commit 591477b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/inlines/Inliner.scala b/compiler/src/dotty/tools/dotc/inlines/Inliner.scala
@@ -315,7 +315,7 @@ class Inliner(val call: tpd.Tree)(using Context):
               case Super(qual, _) => qual
               case pre => pre
             val preLevel = classNestingLevel(inlinedMethod.owner)
-            if preLevel > level then outerSelect(pre, inlinedMethod.owner, preLevel - level, selfSym.info)
+            if preLevel > level then outerSelect(pre, inlinedMethod.owner.enclosingClass, preLevel - level, selfSym.info)
             else pre
 
       val binding = accountForOpaques(

diff --git a/tests/pos/i20300.scala b/tests/pos/i20300.scala
@@ -0,0 +1,8 @@
+trait T:
+
+  def v() = ()
+
+  trait F:
+    def f(): Unit =
+      inline def op(): Unit = v()
+      op()