Check if needs inline only for RefTree and GenericApply trees

Author: nicolasstucki

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

@@ -1254,14 +1254,8 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
       super.ensureAccessible(tpe, superAccess, pos)
     }
 
-    override def typed(tree: untpd.Tree, pt: Type = WildcardType)(using Context): Tree =
-      val tree1 = super.typed(tree, pt)
-      if Inliner.needsInlining(tree1)
-      then Inliner.inlineCall(tree1)
-      else tree1
-
     override def typedIdent(tree: untpd.Ident, pt: Type)(using Context): Tree =
-      tryInlineArg(tree.asInstanceOf[tpd.Tree]) `orElse` super.typedIdent(tree, pt)
+      inlineIfNeeded(tryInlineArg(tree.asInstanceOf[tpd.Tree]) `orElse` super.typedIdent(tree, pt))
 
     override def typedSelect(tree: untpd.Select, pt: Type)(using Context): Tree = {
       assert(tree.hasType, tree)
@@ -1273,7 +1267,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
       else
         val res = resMaybeReduced
         ensureAccessible(res.tpe, tree.qualifier.isInstanceOf[untpd.Super], tree.srcPos)
-        res
+        inlineIfNeeded(res)
     }
 
     override def typedIf(tree: untpd.If, pt: Type)(using Context): Tree =
@@ -1310,14 +1304,14 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
           val expanded = expandMacro(res.args.head, tree.span)
           typedExpr(expanded) // Inline calls and constant fold code generated by the macro
         case res =>
-          res
+          inlineIfNeeded(res)
       }
       if res.symbol == defn.QuotedRuntime_exprQuote then
         ctx.compilationUnit.needsQuotePickling = true
       res
 
     override def typedTypeApply(tree: untpd.TypeApply, pt: Type)(using Context): Tree =
-      constToLiteral(betaReduce(super.typedTypeApply(tree, pt)))
+      inlineIfNeeded(constToLiteral(betaReduce(super.typedTypeApply(tree, pt))))
 
     override def typedMatch(tree: untpd.Match, pt: Type)(using Context): Tree =
       val tree1 =
@@ -1376,6 +1370,10 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
     /** True if this inline typer has already issued errors */
     override def hasInliningErrors(using Context) = ctx.reporter.errorCount > initialErrorCount
 
+    private def inlineIfNeeded(tree: Tree)(using Context): Tree =
+      if Inliner.needsInlining(tree) then Inliner.inlineCall(tree)
+      else tree
+
   }
 
   /** Drop any side-effect-free bindings that are unused in expansion or other reachable bindings.

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

@@ -3406,8 +3406,7 @@ class Typer extends Namer
         val meth = methPart(tree).symbol
         if meth.isAllOf(DeferredInline) && !Inliner.inInlineMethod then
           errorTree(tree, i"Deferred inline ${meth.showLocated} cannot be invoked")
-        else if Inliner.needsInlining(tree)
-        then
+        else if Inliner.needsInlining(tree) then
           tree.tpe <:< wildApprox(pt)
           val errorCount = ctx.reporter.errorCount
           val inlined = Inliner.inlineCall(tree)