Merge pull request #15755 from dotty-staging/backport-15671

Backport #15671: Fix computation of class nesting level in inliner

Author: Kordyjan

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

@@ -613,12 +613,15 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
         assert(argss.isEmpty)
         true
 
+  /** The number of enclosing classes of this class, plus one */
+  private def classNestingLevel(cls: Symbol) = cls.ownersIterator.count(_.isClass)
+
   // Compute val-definitions for all this-proxies and append them to `bindingsBuf`
   private def computeThisBindings() = {
     // All needed this-proxies, paired-with and sorted-by nesting depth of
     // the classes they represent (innermost first)
     val sortedProxies = thisProxy.toList
-      .map((cls, proxy) => (cls.ownersIterator.length, proxy.symbol))
+      .map((cls, proxy) => (classNestingLevel(cls), proxy.symbol))
       .sortBy(-_._1)
 
     var lastSelf: Symbol = NoSymbol
@@ -640,7 +643,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
             val pre = inlineCallPrefix match
               case Super(qual, _) => qual
               case pre => pre
-            val preLevel = inlinedMethod.owner.ownersIterator.length
+            val preLevel = classNestingLevel(inlinedMethod.owner)
             if preLevel > level then pre.outerSelect(preLevel - level, selfSym.info)
             else pre
 

tests/pos/i15666.scala

@@ -0,0 +1,11 @@
+trait GetInt {
+  def value: Int // if we add inline here, the program compiles
+}
+
+class Newtype {
+  def f: Int = ???
+
+  val g = new GetInt {
+    inline def value: Int = f // has to be inline to crash
+  }
+}