Only force inline conditions of inline if

nicolasstucki · nicolasstucki · commit 8e9129978e06 · 2021-02-08T09:46:35.000+01:00
diff --git a/compiler/src/dotty/tools/dotc/typer/Inliner.scala b/compiler/src/dotty/tools/dotc/typer/Inliner.scala
@@ -1271,7 +1271,8 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
     }
 
     override def typedIf(tree: untpd.If, pt: Type)(using Context): Tree =
-      typed(tree.cond, defn.BooleanType)(using ctx.addMode(Mode.ForceInline)) match {
+      val condCtx = if tree.isInline then ctx.addMode(Mode.ForceInline) else ctx
+      typed(tree.cond, defn.BooleanType)(using condCtx) match {
         case cond1 @ ConstantValue(b: Boolean) =>
           val selected0 = if (b) tree.thenp else tree.elsep
           val selected = if (selected0.isEmpty) tpd.Literal(Constant(())) else typed(selected0, pt)

Original file line number	Diff line number	Diff line change
`@@ -1271,7 +1271,8 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {`
`1271`	`1271`	`}`
`1272`	`1272`
`1273`	`1273`	`override def typedIf(tree: untpd.If, pt: Type)(using Context): Tree =`
`1274`		`- typed(tree.cond, defn.BooleanType)(using ctx.addMode(Mode.ForceInline)) match {`
	`1274`	`+ val condCtx = if tree.isInline then ctx.addMode(Mode.ForceInline) else ctx`
	`1275`	`+ typed(tree.cond, defn.BooleanType)(using condCtx) match {`
`1275`	`1276`	`case cond1 @ ConstantValue(b: Boolean) =>`
`1276`	`1277`	`val selected0 = if (b) tree.thenp else tree.elsep`
`1277`	`1278`	`val selected = if (selected0.isEmpty) tpd.Literal(Constant(())) else typed(selected0, pt)`