Add isInlineCall to TreeInfo

Author: nicolasstucki

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

@@ -66,11 +66,8 @@ object CompilationUnit {
     def traverse(tree: Tree)(implicit ctx: Context): Unit = {
       if (tree.symbol.isQuote)
         containsQuotes = true
-      tree match {
-        case _: tpd.RefTree | _: Trees.GenericApply[_] if Inliner.isInlineable(tree) =>
-          containsInline = true
-        case _ =>
-      }
+      if (tpd.isInlineCall(tree))
+        containsInline = true
       traverseChildren(tree)
     }
   }

compiler/src/dotty/tools/dotc/ast/TreeInfo.scala

@@ -5,7 +5,7 @@ package ast
 import core._
 import Flags._, Trees._, Types._, Contexts._
 import Names._, StdNames._, NameOps._, Symbols._
-import typer.ConstFold
+import typer.{ConstFold, Inliner}
 import reporting.trace
 
 import scala.annotation.tailrec
@@ -759,6 +759,14 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
       false
   }
 
+  /** Is this call a call to a method that is marked as Inline */
+  def isInlineCall(arg: Tree)(implicit ctx: Context): Boolean = arg match {
+    case _: RefTree | _: GenericApply[_] =>
+      !arg.tpe.widenDealias.isInstanceOf[MethodicType] && Inliner.isInlineable(arg)
+    case _ =>
+      false
+  }
+
   /** Structural tree comparison (since == on trees is reference equality).
    *  For the moment, only Ident, Select, Literal, Apply and TypeApply are supported
    */

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

@@ -24,7 +24,7 @@ class InlineCalls extends MacroTransform { thisPhase =>
 
   class InlineCallsTransformer extends Transformer {
     override def transform(tree: Tree)(implicit ctx: Context): Tree = tree match {
-      case _: RefTree | _: GenericApply[_] if !tree.tpe.widenDealias.isInstanceOf[MethodicType] && Inliner.isInlineable(tree) && !ctx.reporter.hasErrors =>
+      case tree if isInlineCall(tree) && !ctx.reporter.hasErrors =>
         val tree2 = super.transform(tree) // transform arguments before inlining (inline arguments and constant fold arguments)
         transform(Inliner.inlineCall(tree2, tree.tpe.widen))
       case _: MemberDef =>