Join containsQuotesOrSplices and containsInlineCalls

Author: nicolasstucki

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

@@ -25,15 +25,10 @@ class CompilationUnit(val source: SourceFile) {
   /** Pickled TASTY binaries, indexed by class. */
   var pickled: Map[ClassSymbol, Array[Byte]] = Map()
 
-  /** Will be reset to `true` if `tpdTree` contains a call to an inline method. The information
-   *  is used in phase InlineCalls in order to avoid traversing an inline-less tree.
+  /** Will be reset to `true` if contains `Quote`, `Splice` or calls to inline methods.
+   * The information is used in phase ReifyQuotes in order to avoid traversing a quote-less tree.
    */
-  var containsInlineCalls: Boolean = false
-
-  /** Will be reset to `true` if `untpdTree` contains `Quote` trees. The information
-   *  is used in phase ReifyQuotes in order to avoid traversing a quote-less tree.
-   */
-  var containsQuotesOrSplices: Boolean = false
+  var containsQuotesSplicesOrInline: Boolean = false
 
   /** A structure containing a temporary map for generating inline accessors */
   val inlineAccessors: InlineAccessors = new InlineAccessors
@@ -53,21 +48,18 @@ object CompilationUnit {
     if (forceTrees) {
       val force = new Force
       force.traverse(unit1.tpdTree)
-      unit1.containsInlineCalls = force.containsInline
-      unit1.containsQuotesOrSplices = force.containsQuotes
+      unit1.containsQuotesSplicesOrInline = force.containsQuotesOrInline
     }
     unit1
   }
 
   /** Force the tree to be loaded */
   private class Force extends TreeTraverser {
-    var containsInline = false
-    var containsQuotes = false
+    var containsQuotesOrInline = false
     def traverse(tree: Tree)(implicit ctx: Context): Unit = {
-      if (tree.symbol.isQuote)
-        containsQuotes = true
-      if (tpd.isInlineCall(tree))
-        containsInline = true
+      // Note that top-level splices are still inside the inline methods
+      if (tree.symbol.isQuote || tpd.isInlineCall(tree))
+        containsQuotesOrInline = true
       traverseChildren(tree)
     }
   }

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

@@ -173,13 +173,13 @@ class PostTyper extends MacroTransform with IdentityDenotTransformer { thisPhase
 
       if (sym.isSplice || sym.isQuote) {
         markAsMacro(ctx)
-        ctx.compilationUnit.containsQuotesOrSplices = true
+        ctx.compilationUnit.containsQuotesSplicesOrInline = true
       }
     }
 
     private def handleInlineCall(sym: Symbol)(implicit ctx: Context): Unit = {
       if (sym.is(Inline))
-        ctx.compilationUnit.containsInlineCalls = true
+        ctx.compilationUnit.containsQuotesSplicesOrInline = true
     }
 
     override def transform(tree: Tree)(implicit ctx: Context): Tree =

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

@@ -94,7 +94,7 @@ class ReifyQuotes extends MacroTransformWithImplicits {
   }
 
   override def run(implicit ctx: Context): Unit =
-    if (ctx.compilationUnit.containsInlineCalls || ctx.compilationUnit.containsQuotesOrSplices) super.run
+    if (ctx.compilationUnit.containsQuotesSplicesOrInline) super.run
 
   protected def newTransformer(implicit ctx: Context): Transformer =
     new Reifier(inQuote = false, null, 0, new LevelInfo, new Embedded, ctx)