Move inlining inside Reify quotes

Split some neg tests as now only the first error is emitted.

Author: nicolasstucki

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

@@ -44,7 +44,6 @@ class Compiler {
   /** Phases dealing with TASTY tree pickling and unpickling */
   protected def picklerPhases: List[List[Phase]] =
     List(new Pickler) ::            // Generate TASTY info
-    List(new InlineCalls) ::        // β-reduce inline calls
     List(new ReifyQuotes) ::        // Turn quoted trees into explicit run-time data structures
     Nil
 

compiler/src/dotty/tools/dotc/decompiler/TASTYDecompiler.scala

@@ -2,7 +2,7 @@ package dotty.tools.dotc.decompiler
 
 import dotty.tools.dotc.fromtasty._
 import dotty.tools.dotc.core.Phases.Phase
-import dotty.tools.dotc.transform.InlineCalls
+import dotty.tools.dotc.transform.ReifyQuotes
 
 /** Compiler from tasty to user readable high text representation
  *  of the compiled scala code.
@@ -15,9 +15,7 @@ class TASTYDecompiler extends TASTYCompiler {
     List(new ReadTastyTreesFromClasses) :: // Load classes from tasty
     Nil
 
-  override protected def picklerPhases: List[List[Phase]] =
-    List(new InlineCalls) :: // TODO should we really inline for the decompiler?
-    Nil
+  override protected def picklerPhases: List[List[Phase]] = Nil
 
   override protected def transformPhases: List[List[Phase]] = Nil
 

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

@@ -2,7 +2,12 @@ package dotty.tools.dotc
 package transform
 
 import core._
-import Decorators._, Flags._, Types._, Contexts._, Symbols._, Constants._
+import Decorators._
+import Flags._
+import Types._
+import Contexts._
+import Symbols._
+import Constants._
 import ast.Trees._
 import ast.{TreeTypeMap, untpd}
 import util.Positions._
@@ -15,11 +20,12 @@ import typer.Implicits.SearchFailureType
 import scala.collection.mutable
 import dotty.tools.dotc.core.StdNames._
 import dotty.tools.dotc.core.quoted._
+import dotty.tools.dotc.typer.{ConstFold, Inliner}
 import dotty.tools.dotc.util.SourcePosition
 
 
-/** Translates quoted terms and types to `unpickle` method calls.
- *  Checks that the phase consistency principle (PCP) holds.
+/** Inline calls to inline methods, evaluates macros, translates quoted terms (and types)
+ *  to `unpickle` method calls and checks that the phase consistency principle (PCP) holds.
  *
  *
  *  Transforms top level quote
@@ -60,7 +66,7 @@ import dotty.tools.dotc.util.SourcePosition
  *  The Splicer is used to check that the RHS will be interpretable (with the `Splicer`) once inlined.
  */
 class ReifyQuotes extends MacroTransformWithImplicits {
-  import ast.tpd._
+  import tpd._
   import ReifyQuotes._
 
   /** Classloader used for loading macros */
@@ -88,7 +94,7 @@ class ReifyQuotes extends MacroTransformWithImplicits {
   }
 
   override def run(implicit ctx: Context): Unit =
-    if (ctx.compilationUnit.containsQuotesOrSplices) super.run
+    if (ctx.compilationUnit.containsInlineCalls || ctx.compilationUnit.containsQuotesOrSplices) super.run
 
   protected def newTransformer(implicit ctx: Context): Transformer =
     new Reifier(inQuote = false, null, 0, new LevelInfo, new Embedded, ctx)
@@ -437,7 +443,8 @@ class ReifyQuotes extends MacroTransformWithImplicits {
       else if (enclosingInlineds.nonEmpty) { // level 0 in an inlined call
         val spliceCtx = ctx.outer // drop the last `inlineContext`
         val pos: SourcePosition = Decorators.sourcePos(enclosingInlineds.head.pos)(spliceCtx)
-        val evaluatedSplice = Splicer.splice(splice.qualifier, pos, macroClassLoader)(spliceCtx).withPos(splice.pos)
+        val splicedTree = new InlineCalls().transform(splice.qualifier) // inline calls that where inlined at level -1
+        val evaluatedSplice = Splicer.splice(splicedTree, pos, macroClassLoader)(spliceCtx).withPos(splice.pos)
         if (ctx.reporter.hasErrors) splice else transform(evaluatedSplice)
       }
       else if (!ctx.owner.isInlineMethod) { // level 0 outside an inline method
@@ -560,6 +567,9 @@ class ReifyQuotes extends MacroTransformWithImplicits {
               enteredSyms = enteredSyms.tail
             }
         tree match {
+          case tree if isInlineCall(tree) && level == 0 && !ctx.reporter.hasErrors && !ctx.settings.YnoInline.value =>
+            val tree2 = super.transform(tree) // transform arguments before inlining (inline arguments and constant fold arguments)
+            transform(Inliner.inlineCall(tree2, tree.tpe.widen))
           case Quoted(quotedTree) =>
             quotation(quotedTree, tree)
           case tree: TypeTree if tree.tpe.typeSymbol.isSplice =>
@@ -610,7 +620,7 @@ class ReifyQuotes extends MacroTransformWithImplicits {
             }
           case _ =>
             markDef(tree)
-            checkLevel(mapOverTree(enteredSyms))
+            ConstFold(checkLevel(mapOverTree(enteredSyms)))
         }
       }
 
@@ -635,6 +645,8 @@ class ReifyQuotes extends MacroTransformWithImplicits {
 }
 
 object ReifyQuotes {
+  import tpd._
+
   val name: String = "reifyQuotes"
 
   def toValue(tree: tpd.Tree): Option[Any] = tree match {
@@ -664,4 +676,20 @@ object ReifyQuotes {
     /** Get the list of embedded trees */
     def getTrees: List[tpd.Tree] = trees.toList
   }
+
+  /** β-reduce all calls to inline methods and preform constant folding */
+  class InlineCalls extends TreeMap {
+    override def transform(tree: Tree)(implicit ctx: Context): Tree = tree match {
+      case tree if isInlineCall(tree) && !ctx.reporter.hasErrors && !ctx.settings.YnoInline.value =>
+        val tree2 = super.transform(tree) // transform arguments before inlining (inline arguments and constant fold arguments)
+        transform(Inliner.inlineCall(tree2, tree.tpe.widen))
+      case _: MemberDef =>
+        val newTree = super.transform(tree)
+        if (newTree.symbol.exists)
+          newTree.symbol.defTree = newTree // set for inlined members
+        newTree
+      case _ =>
+        ConstFold(super.transform(tree))
+    }
+  }
 }

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

@@ -301,7 +301,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(implicit ctx: Context) {
   private def registerType(tpe: Type): Unit = tpe match {
     case tpe: ThisType if !canElideThis(tpe) && !thisProxy.contains(tpe.cls) =>
       val proxyName = s"${tpe.cls.name}_this".toTermName
-      val proxyType = inlineCallPrefix.tpe.tryNormalize match {
+      val proxyType = inlineCallPrefix.tpe.dealias.tryNormalize match {
         case typeMatchResult if typeMatchResult.exists => typeMatchResult
         case _ => tpe.asSeenFrom(inlineCallPrefix.tpe, inlinedMethod.owner).widenIfUnstable
       }

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

@@ -985,7 +985,6 @@ t8132
 t8177d
 t8177e
 t8177h
-t8207
 t8219
 t8230a
 t8237

compiler/test/dotc/pos-recompilation.whitelist

@@ -2,11 +2,5 @@ import Macros._
 object Test {
   def main(args: Array[String]): Unit = {
     println(foo(1)) // error
-    println(foo(1  + 3)) // error
-    val x = 3
-    println(foo { // error
-      val x = 5
-      x
-    })
   }
 }

tests/neg-with-compiler/quote-run-in-macro-2/quoted_2.scala

@@ -0,0 +1,11 @@
+import scala.quoted._
+
+import scala.quoted.Toolbox.Default._
+
+object Macros {
+  inline def foo(i: => Int): Int = ~fooImpl('(i))
+  def fooImpl(i: Expr[Int]): Expr[Int] = {
+    val y: Int = i.run
+    y.toExpr
+  }
+}

tests/neg-with-compiler/quote-run-in-macro-3/quoted_1.scala

@@ -0,0 +1,6 @@
+import Macros._
+object Test {
+  def main(args: Array[String]): Unit = {
+    println(foo(1  + 3)) // error
+  }
+}

tests/neg-with-compiler/quote-run-in-macro-3/quoted_2.scala

@@ -0,0 +1,11 @@
+import scala.quoted._
+
+import scala.quoted.Toolbox.Default._
+
+object Macros {
+  inline def foo(i: => Int): Int = ~fooImpl('(i))
+  def fooImpl(i: Expr[Int]): Expr[Int] = {
+    val y: Int = i.run
+    y.toExpr
+  }
+}