Move PrepareInlineable to inlines package

Author: odersky

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

@@ -94,6 +94,45 @@ object Inliner:
         false
     }
   end isElideableExpr
+
+  // InlineCopier is a more fault-tolerant copier that does not cause errors when
+  // function types in applications are undefined. This is necessary since we copy at
+  // the same time as establishing the proper context in which the copied tree should
+  // be evaluated. This matters for opaque types, see neg/i14653.scala.
+  private class InlineCopier() extends TypedTreeCopier:
+    override def Apply(tree: Tree)(fun: Tree, args: List[Tree])(using Context): Apply =
+      if fun.tpe.widen.exists then super.Apply(tree)(fun, args)
+      else untpd.cpy.Apply(tree)(fun, args).withTypeUnchecked(tree.tpe)
+
+  // InlinerMap is a TreeTypeMap with special treatment for inlined arguments:
+  // They are generally left alone (not mapped further, and if they wrap a type
+  // the type Inlined wrapper gets dropped
+  private class InlinerMap(
+      typeMap: Type => Type,
+      treeMap: Tree => Tree,
+      oldOwners: List[Symbol],
+      newOwners: List[Symbol],
+      substFrom: List[Symbol],
+      substTo: List[Symbol])(using Context)
+    extends TreeTypeMap(
+      typeMap, treeMap, oldOwners, newOwners, substFrom, substTo, InlineCopier()):
+
+    override def copy(
+        typeMap: Type => Type,
+        treeMap: Tree => Tree,
+        oldOwners: List[Symbol],
+        newOwners: List[Symbol],
+        substFrom: List[Symbol],
+        substTo: List[Symbol])(using Context) =
+      new InlinerMap(typeMap, treeMap, oldOwners, newOwners, substFrom, substTo)
+
+    override def transformInlined(tree: Inlined)(using Context) =
+      if tree.call.isEmpty then
+        tree.expansion match
+          case expansion: TypeTree => expansion
+          case _ => tree
+      else super.transformInlined(tree)
+  end InlinerMap
 end Inliner
 
 /** Produces an inlined version of `call` via its `inlined` method.
@@ -496,45 +535,6 @@ class Inliner(val call: tpd.Tree)(using Context):
     def inlinedFromOutside(tree: Tree)(span: Span): Tree =
       Inlined(EmptyTree, Nil, tree)(using ctx.withSource(inlinedMethod.topLevelClass.source)).withSpan(span)
 
-    // InlineCopier is a more fault-tolerant copier that does not cause errors when
-    // function types in applications are undefined. This is necessary since we copy at
-    // the same time as establishing the proper context in which the copied tree should
-    // be evaluated. This matters for opaque types, see neg/i14653.scala.
-    class InlineCopier() extends TypedTreeCopier:
-      override def Apply(tree: Tree)(fun: Tree, args: List[Tree])(using Context): Apply =
-        if fun.tpe.widen.exists then super.Apply(tree)(fun, args)
-        else untpd.cpy.Apply(tree)(fun, args).withTypeUnchecked(tree.tpe)
-
-    // InlinerMap is a TreeTypeMap with special treatment for inlined arguments:
-    // They are generally left alone (not mapped further, and if they wrap a type
-    // the type Inlined wrapper gets dropped
-    class InlinerMap(
-        typeMap: Type => Type,
-        treeMap: Tree => Tree,
-        oldOwners: List[Symbol],
-        newOwners: List[Symbol],
-        substFrom: List[Symbol],
-        substTo: List[Symbol])(using Context)
-      extends TreeTypeMap(
-        typeMap, treeMap, oldOwners, newOwners, substFrom, substTo, InlineCopier()):
-
-      override def copy(
-          typeMap: Type => Type,
-          treeMap: Tree => Tree,
-          oldOwners: List[Symbol],
-          newOwners: List[Symbol],
-          substFrom: List[Symbol],
-          substTo: List[Symbol])(using Context) =
-        new InlinerMap(typeMap, treeMap, oldOwners, newOwners, substFrom, substTo)
-
-      override def transformInlined(tree: Inlined)(using Context) =
-        if tree.call.isEmpty then
-          tree.expansion match
-            case expansion: TypeTree => expansion
-            case _ => tree
-        else super.transformInlined(tree)
-    end InlinerMap
-
     // A tree type map to prepare the inlined body for typechecked.
     // The translation maps references to `this` and parameters to
     // corresponding arguments or proxies on the type and term level. It also changes

compiler/src/dotty/tools/dotc/typer/PrepareInlineable.scala renamed to compiler/src/dotty/tools/dotc/inlines/PrepareInlineable.scala

@@ -1,6 +1,6 @@
 package dotty.tools
 package dotc
-package typer
+package inlines
 
 import dotty.tools.dotc.ast.{Trees, tpd, untpd}
 import Trees._

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

@@ -17,7 +17,7 @@ import tpd.tpes
 import Variances.alwaysInvariant
 import config.{Config, Feature}
 import config.Printers.typr
-import inlines.Inlines
+import inlines.{Inlines, PrepareInlineable}
 import parsing.JavaParsers.JavaParser
 import parsing.Parsers.Parser
 import Annotations._

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

@@ -15,6 +15,7 @@ import dotty.tools.dotc.core.StagingContext._
 import dotty.tools.dotc.core.StdNames._
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Types._
+import dotty.tools.dotc.inlines.PrepareInlineable
 import dotty.tools.dotc.transform.SymUtils._
 import dotty.tools.dotc.typer.Implicits._
 import dotty.tools.dotc.typer.Inferencing._

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

@@ -29,7 +29,7 @@ import Inferencing._
 import Dynamic.isDynamicExpansion
 import EtaExpansion.etaExpand
 import TypeComparer.CompareResult
-import inlines.Inlines
+import inlines.{Inlines, PrepareInlineable}
 import util.Spans._
 import util.common._
 import util.{Property, SimpleIdentityMap, SrcPos}

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

@@ -9,6 +9,7 @@ import Symbols._
 import ImportInfo.withRootImports
 import parsing.{Parser => ParserPhase}
 import config.Printers.typr
+import inlines.PrepareInlineable
 import util.Stats._
 
 /**