Remove call of Inlined after PostTyper

Author: nicolasstucki

compiler/src/dotty/tools/dotc/Compiler.scala

@@ -37,7 +37,6 @@ class Compiler {
   /** Phases dealing with the frontend up to trees ready for TASTY pickling */
   protected def frontendPhases: List[List[Phase]] =
     List(new FrontEnd) ::           // Compiler frontend: scanner, parser, namer, typer
-    List(new YCheckPositions) ::    // YCheck positions
     List(new sbt.ExtractDependencies) :: // Sends information on classes' dependencies to sbt via callbacks
     List(new semanticdb.ExtractSemanticDB) :: // Extract info into .semanticdb files
     List(new PostTyper) ::          // Additional checks and cleanups after type checking

compiler/src/dotty/tools/dotc/quoted/PickledQuotes.scala

@@ -32,7 +32,8 @@ object PickledQuotes {
   def pickleQuote(tree: Tree)(using Context): PickledQuote =
     if (ctx.reporter.hasErrors) Nil
     else {
-      assert(!tree.isInstanceOf[Hole]) // Should not be pickled as it represents `'{$x}` which should be optimized to `x`
+      // FIXME handle new optimization opportunities. Previousliy we got some `Inlined(EmptyTree, Nil, Hole(...))` that did not get optimized
+      // assert(!tree.isInstanceOf[Hole]) // Should not be pickled as it represents `'{$x}` which should be optimized to `x`
       val pickled = pickle(tree)
       TastyString.pickle(pickled)
     }
@@ -56,11 +57,9 @@ object PickledQuotes {
     val tastyBytes = TastyString.unpickle(tasty)
     val unpickled = withMode(Mode.ReadPositions)(
       unpickle(tastyBytes, splices, isType = false))
-    val Inlined(call, Nil, expnasion) = unpickled
-    val inlineCtx = inlineContext(call)
-    val expansion1 = spliceTypes(expnasion, splices)(using inlineCtx)
-    val expansion2 = spliceTerms(expansion1, splices)(using inlineCtx)
-    cpy.Inlined(unpickled)(call, Nil, expansion2)
+    val expansion1 = spliceTypes(unpickled, splices)
+    val expansion2 = spliceTerms(expansion1, splices)
+    cpy.Inlined(unpickled)(EmptyTree, Nil, expansion2)
   }
 
   /** Unpickle the tree contained in the TastyType */

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

@@ -289,9 +289,7 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
               super.transform(tree1)
           }
         case Inlined(call, bindings, expansion) if !call.isEmpty =>
-          val pos = call.sourcePos
-          val callTrace = Inliner.inlineCallTrace(call.symbol, pos)(using ctx.withSource(pos.source))
-          cpy.Inlined(tree)(callTrace, transformSub(bindings), transform(expansion)(using inlineContext(tree)))
+          cpy.Inlined(tree)(EmptyTree, transformSub(bindings), transform(expansion)(using inlineContext(tree)))
         case templ: Template =>
           withNoCheckNews(templ.parents.flatMap(newPart)) {
             forwardParamAccessors(templ)

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

@@ -132,14 +132,8 @@ class ReifyQuotes extends MacroTransform {
       }
       else {
         val (body1, splices) = nested(isQuote = true).splitQuote(body)(using quoteContext)
-        if (level == 0) {
-          val body2 =
-            if (body1.isType) body1
-            else Inlined(Inliner.inlineCallTrace(ctx.owner, quote.sourcePos), Nil, body1)
-          pickledQuote(body2, splices, body.tpe, isType).withSpan(quote.span)
-        }
-        else
-          body
+        if level == 0 then pickledQuote(body1, splices, body.tpe, isType).withSpan(quote.span)
+        else body
       }
     }
 

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

@@ -258,19 +258,6 @@ object Inliner {
     (new Reposition).transform(tree)
   }
 
-  /** Leave only a call trace consisting of
-   *  - a reference to the top-level class from which the call was inlined,
-   *  - the call's position
-   *  in the call field of an Inlined node.
-   *  The trace has enough info to completely reconstruct positions.
-   *  Note: For macros it returns a Select and for other inline methods it returns an Ident (this distinction is only temporary to be able to run YCheckPositions)
-   */
-  def inlineCallTrace(callSym: Symbol, pos: SourcePosition)(using Context): Tree = {
-    assert(ctx.source == pos.source)
-    if (callSym.is(Macro)) ref(callSym.topLevelClass.owner).select(callSym.topLevelClass.name).withSpan(pos.span)
-    else Ident(callSym.topLevelClass.typeRef).withSpan(pos.span)
-  }
-
   object Intrinsics {
     import dotty.tools.dotc.reporting.Diagnostic.Error
     private enum ErrorKind: